hotfix merge conflict

app.py

@@ -16,10 +16,7 @@ from climateqa.chat import start_chat, chat_stream, finish_chat
 from front.tabs import create_config_modal, cqa_tab, create_about_tab
 from front.tabs import MainTabPanel, ConfigPanel
 from front.tabs.tab_drias import create_drias_tab
-<<<<<<< HEAD
 from front.tabs.tab_ipcc import create_ipcc_tab
-=======
->>>>>>> hf-origin/main
 from front.utils import process_figures
 from gradio_modal import Modal
 
@@ -536,13 +533,8 @@ def main_ui():
         with gr.Tabs():
             cqa_components = cqa_tab(tab_name="ClimateQ&A")
             local_cqa_components = cqa_tab(tab_name="France - Local Q&A")
-<<<<<<< HEAD
             drias_components = create_drias_tab(share_client=share_client, user_id=user_id)
             ipcc_components = create_ipcc_tab(share_client=share_client, user_id=user_id)
-=======
-            create_drias_tab(share_client=share_client, user_id=user_id)
-
->>>>>>> hf-origin/main
             create_about_tab()
 
         event_handling(cqa_components, config_components, tab_name="ClimateQ&A")

style.css

@@ -656,20 +656,11 @@ a {
     /* overflow-y: scroll; */
 }
 #sql-query{
-<<<<<<< HEAD
     max-height: 100%;
 }
 
 #sql-query textarea{
     min-height: 200px !important;
-=======
-    max-height: 300px;
-    overflow-y:scroll;
-}
-
-#sql-query textarea{
-    min-height: 100px !important;
->>>>>>> hf-origin/main
 }
 
 #sql-query span{