fix

deepset-ai · Mar 13, 2024 · ad55fcc · ad55fcc
1 parent 3889dc2
commit ad55fcc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/integrations/pgvector/tests/test_document_store.py b/integrations/pgvector/tests/test_document_store.py
@@ -39,12 +39,8 @@ def test_write_dataframe(self, document_store: PgvectorDocumentStore):
         assert retrieved_docs == docs
 
 
-<<<<<<< HEAD
-def test_init(patches_for_unit_tests, monkeypatch):  # noqa: ARG001  patches are not explicitly called but necessary
-=======
 @pytest.mark.usefixtures("patches_for_unit_tests")
 def test_init(monkeypatch):
->>>>>>> main
     monkeypatch.setenv("PG_CONN_STR", "some_connection_string")
 
     document_store = PgvectorDocumentStore(