Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / zookeeper / resources /
drwxr-xr-x   ..
-rw-r--r-- 846 log4j.properties