fix: merge conflict

frankpagan · frankpagan · commit 944e85b1bcf4 · 2024-04-25T23:17:17.000-05:00
diff --git a/src/client.js b/src/client.js
@@ -63,10 +63,6 @@ async function send(conversation) {
     try {
         let data = await crud.socket.send({
             method: 'openai.chat.completions.create',
-<<<<<<< HEAD
-            action: 'chat',
-=======
->>>>>>> master
             openai: {
                 messages: conversation,
                 max_tokens,
