Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / etc / init.d /
drwxr-xr-x   ..
-rwxr-xr-x 2384 indexdata-solr-zookeeper