Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

Fix bad merge

Jeremiah Lowin8ba1478dc5c5
diff --git a/src/fastmcp/server/server.py b/src/fastmcp/server/server.py
index bc26411cb..d72c0351a 100644
--- a/src/fastmcp/server/server.py
+++ b/src/fastmcp/server/server.py
@@ -139,11 +139,8 @@ class FastMCP(Generic[LifespanResultT]):
| None = None,
**settings: Any,
):
-<<<<<<< Updated upstream
-=======
if cache_expiration_seconds is not None:
settings["cache_expiration_seconds"] = cache_expiration_seconds
->>>>>>> Stashed changes
self.settings = fastmcp.settings.ServerSettings(
include_tags=include_tags, exclude_tags=exclude_tags, **settings
)