Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / conf3 / solrconfig-slave.xml
2013-07-02 Dennis SchafrothBack to Solr 4. Solr 3 in own config