Solve rebase conflict

GoogleCloudPlatform · Sep 4, 2024 · 1800a04 · 1800a04
1 parent c68d44e
commit 1800a04
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/retrieval_service/datastore/providers/neo4j_graph_test.py b/retrieval_service/datastore/providers/neo4j_graph_test.py
@@ -240,12 +240,6 @@ async def test_amenities_search(
     top_k: int,
     expected: List[Any],
 ):
-<<<<<<< HEAD
     res, sql = await ds.amenities_search(query_embedding, similarity_threshold, top_k)
-=======
-
-    res, sql = await ds.amenities_search(query_embedding, similarity_threshold, top_k)
-
->>>>>>> 06e09fa (Improve log warning)
     assert res == expected
     assert sql is None