[lucene-solr] 01/01: SOLR-14151: Reverting a change I missed out

[is...@apache.org]

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

ishan pushed a commit to branch jira/solr-14151-revert
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 9a6bfe3c24e37b9e370de777c4fc7a461c4deaac
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Sat Sep 19 09:15:02 2020 +0530

    SOLR-14151: Reverting a change I missed out
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 4f5d7c7..0672ab4 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -221,12 +221,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
   private final RecoveryStrategy.Builder recoveryStrategyBuilder;
   private IndexReaderFactory indexReaderFactory;
   private final Codec codec;
-<<<<<<< HEAD
-  //singleton listener for all packages used in schema
-  private final PackageListeningClassLoader schemaPluginsLoader;
-=======
   private final MemClassLoader memClassLoader;
->>>>>>> parent of 03d658a7bc3... SOLR-14151 Make schema components load from packages (#1669)
 
   private final CircuitBreakerManager circuitBreakerManager;