Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / conf / admin-extra.html
2012-01-31 Dennis Schafrothrenamed solr-conf conf