From 8ba1478dc5c55ddc38eb22aa2375980a6f026267 Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Sat, 7 Jun 2025 18:39:55 -0400
Subject: [PATCH] Fix bad merge

---
 src/fastmcp/server/server.py | 3 ---
 1 file changed, 3 deletions(-)

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
         )