remove invalid code

chroma-core · Sep 11, 2024 · ec37c1a · ec37c1a
1 parent c7e036c
commit ec37c1a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/chromadb/test/property/test_embeddings.py b/chromadb/test/property/test_embeddings.py
@@ -802,10 +802,6 @@ def test_autocasting_validate_embeddings_for_compatible_types(
     supported_types: List[Any],
 ) -> None:
     embds = strategies.create_embeddings(10, 10, supported_types)
-<<<<<<< HEAD
-
-=======
->>>>>>> c9b8f2d7 (remove normalize embeddings func)
     validated_embeddings = validate_embeddings(maybe_cast_one_to_many_embedding(embds))  # type: ignore[arg-type]
     assert all(
         [