Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / zookeeper / etc /
drwxr-xr-x   ..
-rwxr-xr-x 1571 create-solrtest.keystore.sh
-rw-r--r-- 8430 jetty.xml
-rw-r--r-- 1482 logging.properties
-rw-r--r-- 2208 solrtest.keystore
-rw-r--r-- 24426 webdefault.xml