Update app.py

app.py

@@ -236,13 +236,10 @@ with gr.Blocks(css=customCSS, theme=beautiful_theme) as demo:
             with gr.Column(min_width=50, scale=1):
                 with gr.Tab(label="ChatGPT"):
                     gr.Markdown(f'<p style="text-align:center">Get your Open AI API key <a '
-<<<<<<< HEAD
                                 f'href="https://platform.openai.com/account/api-keys">here</a></p>')
                     openAI_key=gr.Textbox(label='Enter your OpenAI API key here')
-=======
                     f'href="https://platform.openai.com/account/api-keys">here</a></p>')
                     openAI_key=gr.Textbox(label='Enter your OpenAI API key here and press Enter')
->>>>>>> 2cb7b56a3054d0b5febf8ed9db8c59395b2d0327
                     model_select_dropdown = gr.Dropdown(
                         label="Select model", choices=MODELS, multiselect=False, value=MODELS[0]
                     )
@@ -263,18 +260,11 @@ with gr.Blocks(css=customCSS, theme=beautiful_theme) as demo:
                             interactive=True,
                             label="Temperature",
                         )
-<<<<<<< HEAD
-    user_input.submit(predict, inputs=[openAI_key, history, chatbot, user_input, temperature, model_select_dropdown, index_files],
-                      outputs=[chatbot, history])
-    user_input.submit(lambda: "", None, user_input)
-    submitBtn.click(predict, inputs=[openAI_key, history, chatbot, user_input, temperature, model_select_dropdown, index_files],
-=======
     openAI_key.submit(set_openai_api_key, [openAI_key], [input_raws])
     user_input.submit(predict, inputs=[history, chatbot, user_input, temperature, language_select_dropdown, model_select_dropdown, index_files],
                       outputs=[chatbot, history])
     user_input.submit(lambda: "", None, user_input)
     submitBtn.click(predict, inputs=[history, chatbot, user_input, temperature, language_select_dropdown, model_select_dropdown, index_files],
->>>>>>> 2cb7b56a3054d0b5febf8ed9db8c59395b2d0327
                     outputs=[chatbot, history])
     submitBtn.click(lambda: "", None, user_input)
     demo.queue(concurrency_count=10).launch(server_name="0.0.0.0", server_port=7862)