Commit b8f2d4a
docs: remove leftover merge conflict markers from MCP Apps guide (#210)
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>1 parent 33de6b6 commit b8f2d4a
1 file changed
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
508 | 508 | | |
509 | 509 | | |
510 | 510 | | |
511 | | - | |
512 | 511 | | |
513 | 512 | | |
514 | 513 | | |
| |||
544 | 543 | | |
545 | 544 | | |
546 | 545 | | |
547 | | - | |
| 546 | + | |
548 | 547 | | |
549 | 548 | | |
550 | 549 | | |
| |||
593 | 592 | | |
594 | 593 | | |
595 | 594 | | |
596 | | - | |
597 | 595 | | |
598 | 596 | | |
599 | 597 | | |
| |||
0 commit comments