fix conflicts

openml-labs · Aug 23, 2024 · ccf0e63 · ccf0e63
1 parent 3fd7990
commit ccf0e63
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/frontend/ui_utils.py b/frontend/ui_utils.py
@@ -13,6 +13,7 @@
 from structured_query.chroma_store_utilis import *
 
 
+
 def feedback_cb():
     """
     Description: Callback function to save feedback to a file

diff --git a/structured_query/evaluation.ipynb b/structured_query/evaluation.ipynb
@@ -1437,6 +1437,7 @@
     "\n",
     "meteor(x, y)"
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
    ]
   },
@@ -3750,6 +3751,8 @@
 =======
 >>>>>>> 6343497 (crawler API)
 =======
+>>>>>>> 6343497 (crawler API)
+=======
 >>>>>>> 6343497 (crawler API)
    ]
   },

diff --git a/useful_scripts/test_strutured_query_pipeline.ipynb b/useful_scripts/test_strutured_query_pipeline.ipynb
@@ -362,6 +362,7 @@
     "\n",
     "\n",
     "\n",
+    "\n",
     "# Override the load_paths method\n",
     "def custom_load_paths():\n",
     "    with open(custom_paths_json_path, \"r\") as file:\n",