Skip to content

[Docs] Remove conflict markers from OAS file#216002

Merged
florent-leborgne merged 2 commits intoelastic:8.18from
florent-leborgne:docs/818-serverless-oas-fixes
Mar 26, 2025
Merged

[Docs] Remove conflict markers from OAS file#216002
florent-leborgne merged 2 commits intoelastic:8.18from
florent-leborgne:docs/818-serverless-oas-fixes

Conversation

@florent-leborgne
Copy link
Copy Markdown
Member

This PR removes conflict markers introduced in #215988 as well as some older ones in the serverless OAS file

@florent-leborgne florent-leborgne added Team:Docs release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting docs APIDocs v8.18.0 labels Mar 26, 2025
@florent-leborgne florent-leborgne requested a review from a team March 26, 2025 09:47
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-docs (Team:Docs)

Copy link
Copy Markdown
Member

@leemthompo leemthompo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹

@florent-leborgne florent-leborgne enabled auto-merge (squash) March 26, 2025 10:27
@florent-leborgne florent-leborgne merged commit 7685194 into elastic:8.18 Mar 26, 2025
21 checks passed
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

APIDocs backport:skip This PR does not require backporting docs release_note:skip Skip the PR/issue when compiling release notes Team:Docs v8.18.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants