Update app.py

app.py

@@ -57,19 +57,9 @@ def call_generate_text(message, history):
     print(message)
     print(history)
    
-    #messages = history + message
-<<<<<<< HEAD
-    messages =history + [{"role":"user","content":message}]
-    try:
-        text = generate_text(history)
-        #history.append({"role": "assistant", "content": text})
-=======
-   # messages = [{"role":"user","content":message}]
     messages = history+[{"role":"user","content":message}]
     try:
         text = generate_text(messages)
-        history.append({"role": "assistant", "content": text})
->>>>>>> 82325f6d06d848b6c1600ce2902018538b68230b
         return text
     except RuntimeError  as e:
         print(f"An unexpected error occurred: {e}")