[lucene-solr] branch branch_8x updated: Ref guide: clean up markers from incomplete merge conflict resolution

[ct...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch_8x by this push:
     new f802ccb  Ref guide: clean up markers from incomplete merge conflict resolution
f802ccb is described below

commit f802ccbd99faafc6599d483faafe87eb83e45be4
Author: Cassandra Targett <ca...@lucidworks.com>
AuthorDate: Thu Jun 25 14:33:20 2020 -0500

    Ref guide: clean up markers from incomplete merge conflict resolution
---
 solr/solr-ref-guide/src/cluster-node-management.adoc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/solr/solr-ref-guide/src/cluster-node-management.adoc b/solr/solr-ref-guide/src/cluster-node-management.adoc
index a98cf2a..a605d84 100644
--- a/solr/solr-ref-guide/src/cluster-node-management.adoc
+++ b/solr/solr-ref-guide/src/cluster-node-management.adoc
@@ -499,7 +499,6 @@ http://localhost:8983/solr/admin/collections?action=OVERSEERSTATUS
   "..."
  }
 ----
-<<<<<<< HEAD
 
 [[migratestateformat]]
 == MIGRATESTATEFORMAT: Migrate Cluster State
@@ -517,5 +516,3 @@ The name of the collection to be migrated from `clusterstate.json` to its own `s
 Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.
 
 This API is useful in migrating any collections created prior to Solr 5.0 to the more scalable cluster state format now used by default. If a collection was created in any Solr 5.x version or higher, then executing this command is not necessary.
-=======
->>>>>>> f1650d5f47c... Ref Guide: prep for 8.6: upgrade notes, typos