Skip to content

Commit f68e110

Browse files
committed
Modified doc
1 parent 36695ac commit f68e110

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
@@ -231,7 +231,6 @@ $server = Server::builder()
231231

232232
## Documentation
233233

234-
<<<<<<< HEAD
235234
**Core Concepts:**
236235
- [Server Builder](docs/server-builder.md) - Complete ServerBuilder reference and configuration
237236
- [Transports](docs/transports.md) - STDIO and HTTP transport setup and usage
@@ -240,8 +239,6 @@ $server = Server::builder()
240239
**Learning:**
241240
- [Examples](docs/examples.md) - Comprehensive example walkthroughs
242241

243-
**External Resources:**
244-
=======
245242
### MCP Logging
246243

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

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

270-
### Additional Resources
271-
267+
**External Resources:**
272268
- [SDK documentation](doc/index.rst)
273-
>>>>>>> 34ae3c3 (Added doc)
274269
- [Model Context Protocol documentation](https://modelcontextprotocol.io)
275270
- [Model Context Protocol specification](https://spec.modelcontextprotocol.io)
276271
- [Officially supported servers](https://github.com/modelcontextprotocol/servers)

0 commit comments

Comments
 (0)