From b3fe2076a7fb8578907178b2359d1f132716f0d5 Mon Sep 17 00:00:00 2001
From: Cole Medin <cole@dynamous.ai>
Date: Sat, 9 Nov 2024 07:56:43 -0600
Subject: [PATCH] Fixing merge conflicts in BaseChat.tsx

---
 .gitignore                       | 1 +
 app/components/chat/BaseChat.tsx | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69d2790..b43105b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ dist-ssr
 _worker.bundle
 
 Modelfile
+modelfiles
diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index bb0c527..e91254a 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -113,7 +113,6 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
     ref,
   ) => {
     const TEXTAREA_MAX_HEIGHT = chatStarted ? 400 : 200;
-    const [provider, setProvider] = useState(DEFAULT_PROVIDER);
     const [apiKeys, setApiKeys] = useState<Record<string, string>>({});
 
     useEffect(() => {
@@ -200,8 +199,6 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                   provider={provider}
                   setProvider={setProvider}
                   providerList={providerList}
-                  provider={provider}
-                  setProvider={setProvider}
                 />
                 <APIKeyManager
                   provider={provider}