Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / zookeeper / multicore /
drwxr-xr-x   ..
-rw-r--r-- 267 README.txt
drwxr-xr-x - core0
drwxr-xr-x - core1
drwxr-xr-x - exampledocs
-rw-r--r-- 1414 solr.xml
-rw-r--r-- 501 zoo.cfg