Fix conflicts

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
mindvalley · Sep 19, 2024 · 6de7ce6 · 6de7ce6
1 parent 2f6a046
commit 6de7ce6
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/backend/danswer/indexing/indexing_pipeline.py b/backend/danswer/indexing/indexing_pipeline.py
@@ -48,16 +48,11 @@ class DocumentBatchPrepareContext(BaseModel):
 
 class IndexingPipelineProtocol(Protocol):
     def __call__(
-<<<<<<< HEAD
         self,
         document_batch: list[Document],
         index_attempt_metadata: IndexAttemptMetadata,
     ) -> tuple[int, int]:
         ...
-=======
-        self, documents: list[Document], index_attempt_metadata: IndexAttemptMetadata
-    ) -> tuple[int, int]: ...
->>>>>>> 82e0d35b (Stop using redis to test the stability of new postgres connection handling)
 
 
 def upsert_documents_in_db(