[20/24] lucene-solr:jira/solr-8593: Remove stray conflict marker.

[kr...@apache.org]

Remove stray conflict marker.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/48ef96d5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/48ef96d5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/48ef96d5

Branch: refs/heads/jira/solr-8593
Commit: 48ef96d573c7cb528fce15d1ffb26a629a778b5c
Parents: 8bbdb62
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Dec 20 11:45:45 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Dec 20 11:45:45 2016 +0100

----------------------------------------------------------------------
 solr/CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/48ef96d5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 519cdfa..52112cd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -173,7 +173,6 @@ New Features
 * SOLR-9844: FieldCache information fetched via the mbeans handler or seen via the UI now displays the total size used.
   The individual cache entries in the response are now formatted better as well. (Varun Thacker)
 
-<<<<<<< HEAD
 * SOLR-9513: Generic authentication plugins (GenericHadoopAuthPlugin and ConfigurableInternodeAuthHadoopPlugin) that delegate
   all functionality to Hadoop authentication framework. (Hrishikesh Gadre via Ishan Chattopadhyaya)