commit 9a6bfe3c24e37b9e370de777c4fc7a461c4deaac
author Ishan Chattopadhyaya <ishan@apache.org> Sat Sep 19 09:15:02 2020 +0530
committer Ishan Chattopadhyaya <ishan@apache.org> Sat Sep 19 09:15:02 2020 +0530
tree e3f2151b8c9bdc73068407a81eb66a2fdddf5d50
parent 73ea81dbd6d8b36442329b27e7e47f88d91bfd68

SOLR-14151: Reverting a change I missed out

solr/core/src/java/org/apache/solr/core/SolrCore.java

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 @@
   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;