fix missed conflict

pattonjp · Dec 8, 2023 · 2a45fb2 · 2a45fb2
1 parent ddf6d5c
commit 2a45fb2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/examples/huggingface-milvus-vectorstore-example/milvus_vectorstore_example.go b/examples/huggingface-milvus-vectorstore-example/milvus_vectorstore_example.go
@@ -9,11 +9,7 @@ import (
 	"github.com/milvus-io/milvus-sdk-go/v2/client"
 	"github.com/milvus-io/milvus-sdk-go/v2/entity"
 	"github.com/tmc/langchaingo/embeddings"
-<<<<<<< HEAD
 	"github.com/tmc/langchaingo/llms/tei"
-=======
-	"github.com/tmc/langchaingo/embeddings/tei"
->>>>>>> main
 	"github.com/tmc/langchaingo/schema"
 
 	"github.com/tmc/langchaingo/vectorstores"