Skip to content

Commit 035b75e

Browse files
committed
Modified doc
1 parent 9fcf1c3 commit 035b75e

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ $server = Server::builder()
233233

234234
## Documentation
235235

236-
<<<<<<< HEAD
237236
**Core Concepts:**
238237
- [Server Builder](docs/server-builder.md) - Complete ServerBuilder reference and configuration
239238
- [Transports](docs/transports.md) - STDIO and HTTP transport setup and usage
@@ -242,8 +241,6 @@ $server = Server::builder()
242241
**Learning:**
243242
- [Examples](docs/examples.md) - Comprehensive example walkthroughs
244243

245-
**External Resources:**
246-
=======
247244
### MCP Logging
248245

249246
The SDK provides comprehensive logging capabilities following the [MCP logging specification](https://modelcontextprotocol.io/specification/2025-06-18/server/utilities/logging):
@@ -269,10 +266,8 @@ $server = Server::builder()
269266

270267
📖 **[Complete MCP Logging Guide](docs/mcp-logging.md)**
271268

272-
### Additional Resources
273-
269+
**External Resources:**
274270
- [SDK documentation](doc/index.rst)
275-
>>>>>>> 34ae3c3 (Added doc)
276271
- [Model Context Protocol documentation](https://modelcontextprotocol.io)
277272
- [Model Context Protocol specification](https://spec.modelcontextprotocol.io)
278273
- [Officially supported servers](https://github.com/modelcontextprotocol/servers)

0 commit comments

Comments
 (0)