Fixing merge conflicts in BaseChat.tsx

This commit is contained in:
Cole Medin 2024-11-09 07:56:43 -06:00
parent 936a9c0f69
commit b3fe2076a7
2 changed files with 1 additions and 3 deletions

1
.gitignore vendored
View File

@ -31,3 +31,4 @@ dist-ssr
_worker.bundle
Modelfile
modelfiles

View File

@ -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}