From a010f10c2635e482bc5a21d36d11221a7031dde1 Mon Sep 17 00:00:00 2001
From: Ido Salomon <idosalomon@gmail.com>
Date: Sat, 12 Apr 2025 00:50:37 +0300
Subject: [PATCH] remove bad merges

---
 client/src/App.tsx                    | 2 +-
 client/src/lib/hooks/useConnection.ts | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/src/App.tsx b/client/src/App.tsx
index 8d17db4..fb78dc6 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -45,7 +45,7 @@ import Sidebar from "./components/Sidebar";
 import ToolsTab from "./components/ToolsTab";
 import { DEFAULT_INSPECTOR_CONFIG } from "./lib/constants";
 import { InspectorConfig } from "./lib/configurationTypes";
-import { getMCPProxyAddress, getMCPServerRequestTimeout } from "./utils/configUtils";
+import { getMCPProxyAddress } from "./utils/configUtils";
 import { useToast } from "@/hooks/use-toast";
 
 const params = new URLSearchParams(window.location.search);
diff --git a/client/src/lib/hooks/useConnection.ts b/client/src/lib/hooks/useConnection.ts
index 12ff2e1..cc91474 100644
--- a/client/src/lib/hooks/useConnection.ts
+++ b/client/src/lib/hooks/useConnection.ts
@@ -49,7 +49,6 @@ interface UseConnectionOptions {
   env: Record<string, string>;
   bearerToken?: string;
   headerName?: string;
-  requestTimeout?: number;
   config: InspectorConfig;
   onNotification?: (notification: Notification) => void;
   onStdErrNotification?: (notification: Notification) => void;
@@ -67,7 +66,6 @@ export function useConnection({
   env,
   bearerToken,
   headerName,
-  requestTimeout,
   config,
   onNotification,
   onStdErrNotification,