Fixing merge conflicts in BaseChat.tsx

stackblitz-labs · Nov 9, 2024 · b3fe207 · b3fe207
1 parent 936a9c0
commit b3fe207
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,3 +31,4 @@ dist-ssr
		_worker.bundle

		Modelfile
		modelfiles