Fix merge conflict

blevesearch · Feb 13, 2024 · 5c7445c · 5c7445c
1 parent a0cb65a
commit 5c7445c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/index_impl.go b/index_impl.go
@@ -717,11 +717,7 @@ func LoadAndHighlightFields(hit *search.DocumentMatch, req *SearchRequest,
 	if len(req.Fields) > 0 || highlighter != nil {
 		doc, err := r.Document(hit.ID)
 		if err == nil && doc != nil {
-<<<<<<< HEAD
 			if len(req.Fields) > 0 && hit.Fields == nil {
-=======
-			if len(req.Fields) > 0 {
->>>>>>> origin/master
 				totalStoredFieldsBytes = doc.StoredFieldsBytes()
 				fieldsToLoad := deDuplicate(req.Fields)
 				for _, f := range fieldsToLoad {