updated setup

franciscojavierarceo · franciscojavierarceo · commit 2ee74c5e4c8f · 2024-12-21T21:19:30.000-05:00
Signed-off-by: Francisco Javier Arceo &lt;farceo@redhat.com&gt;
diff --git a/setup.py b/setup.py
@@ -154,11 +154,9 @@
 FAISS_REQUIRED = ["faiss-cpu>=1.7.0,<2"]
 QDRANT_REQUIRED = ["qdrant-client>=1.12.0"]
 
-<<<<<<< HEAD
 GO_REQUIRED = ["cffi~=1.15.0"]
-=======
+
 MILVUS_REQUIRED = ["pymilvus"]
->>>>>>> 321538df2 (feat: Adding support for Milvus as a Vector database)
 
 MILVUS_REQUIRED = ["pymilvus"]
 
