fix: resolve conflicts

2025-06-02 11:39:49 +01:00
parent 9e64c2cccf
commit 33e0860468
3 changed files with 69 additions and 67 deletions
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -370,8 +370,8 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                        append={append}
                        chatMode={chatMode}
                        setChatMode={setChatMode}
-                        model={model}
                        provider={provider}
+                        model={model}
                      />
                    ) : null;
                  }}