chore: resolve rebase conflict

janhq · Dec 10, 2023 · db1a0c3 · db1a0c3
1 parent 4da9c1c
commit db1a0c3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/web/hooks/useSendChatMessage.ts b/web/hooks/useSendChatMessage.ts
@@ -54,11 +54,7 @@ export default function useSendChatMessage() {
     modelRef.current = activeModel
   }, [activeModel])
 
-<<<<<<< HEAD
   const resendChatMessage = async (currentMessage: ThreadMessage) => {
-=======
-  const resendChatMessage = async () => {
->>>>>>> 36d94890 (fix: Add hack waiting for model loading)
     if (!activeThread) {
       console.error('No active thread')
       return