From ad55fcc6b39cec807c62afc22ed05d980196739c Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 13 Mar 2024 13:39:58 +0100 Subject: [PATCH] fix --- integrations/pgvector/tests/test_document_store.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/integrations/pgvector/tests/test_document_store.py b/integrations/pgvector/tests/test_document_store.py index bd8d4478d..bf5ccd5d4 100644 --- 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(