docs: remove leftover merge conflict markers from MCP Apps guide#210
Merged
Conversation
Raw conflict markers from #179 were committed into docs/src/guide/mcp-apps.md and are rendered on the published docs page. Both conflicting sections are valid, non-overlapping content (Customizing Host Identity and Handling Custom Requests), so keep both and drop the markers. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
docs/src/guide/mcp-apps.mdhas raw git conflict markers (<<<<<<</=======/>>>>>>>) committed onmain— they slipped in with #179 and are currently rendered on the published docs page.Both sides of the conflict are valid, non-overlapping sections:
hostInfo/hostCapabilitiesprops added in feat: add hostInfo and hostCapabilities props to AppRenderer #179)onFallbackRequest) (already linked from the Key Props list earlier in the page)This PR keeps both sections and removes only the three marker lines.
🤖 Generated with Claude Code