refactor: Solve merge conflicts

Shazwazza · Aug 16, 2023 · 3b44ba3 · 3b44ba3
1 parent ecada8b
commit 3b44ba3
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/Examine.Lucene/Search/LuceneSearchExecutor.cs b/src/Examine.Lucene/Search/LuceneSearchExecutor.cs
@@ -119,7 +119,6 @@ public ISearchResults Execute()
 
                 TopDocs topDocs;
                 ICollector topDocsCollector;
-                var facetsCollector = _facetFields.Any() ? new FacetsCollector() : null;
                 bool trackMaxScore = _luceneQueryOptions == null ? false : _luceneQueryOptions.TrackDocumentMaxScore;
                 bool trackDocScores = _luceneQueryOptions == null ? false : _luceneQueryOptions.TrackDocumentScores;
 
@@ -196,7 +195,7 @@ public ISearchResults Execute()
             }
         }
 
-        private static FieldDoc GetScoreDocAfter(LuceneQueryOptions luceneQueryOptions)
+        private static FieldDoc GetScoreDocAfter(SearchAfterOptions searchAfterOptions)
         {
             FieldDoc scoreDocAfter;