[lucene-solr] branch branch_8_8 updated: SOLR-15243: remove merge conflict

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctargett pushed a commit to branch branch_8_8
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8_8 by this push:
     new 6755a41  SOLR-15243: remove merge conflict
6755a41 is described below

commit 6755a41661d0fc459e802d3e90b2bdad7d8ba622
Author: Cassandra Targett <ct...@apache.org>
AuthorDate: Tue Mar 30 10:51:02 2021 -0500

    SOLR-15243: remove merge conflict
---
 solr/solr-ref-guide/src/morelikethis.adoc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/solr/solr-ref-guide/src/morelikethis.adoc b/solr/solr-ref-guide/src/morelikethis.adoc
index c1d8600..72fb9aa 100644
--- a/solr/solr-ref-guide/src/morelikethis.adoc
+++ b/solr/solr-ref-guide/src/morelikethis.adoc
@@ -494,9 +494,6 @@ Each of these documents are similar to the document in the result list to varyin
 
 == MoreLikeThis Query Parser
 
-<<<<<<< HEAD
-The `mlt` query parser provides a mechanism to retrieve documents similar to a given document, like the handler. More information on the usage of the mlt query parser can be found in the section <<other-parsers.adoc#other-parsers,Other Parsers>>.
-=======
 The `mlt` query parser provides a mechanism to retrieve documents similar to a specific document, like the request handler.
 
 It uses Lucene's existing `MoreLikeThis` logic and also works in SolrCloud mode.
@@ -645,4 +642,3 @@ The query parser response includes only the similar documents sorted by score:
         "_version_":1693062911095734272}]
   }}
 ----
->>>>>>> eaba6040968... SOLR-15243: Update MoreLikeThis docs