Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Fix stray merge text.

Kishore Nallanbee8096bf919
diff --git a/test/collection_vector_search_test.cpp b/test/collection_vector_search_test.cpp
index 755cb6ee..fde61f9e 100644
--- a/test/collection_vector_search_test.cpp
+++ b/test/collection_vector_search_test.cpp
@@ -3122,7 +3122,6 @@ TEST_F(CollectionVectorTest, TryAddingMultipleImageFieldToEmbedFrom) {
ASSERT_EQ(collection_create_op.error(), "Only one field can be used in the `embed.from` property of an embed field when embedding from an image field.");
}
-<<<<<<< Updated upstream
TEST_F(CollectionVectorTest, TestInvalidImage) {
auto schema_json =