Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / zookeeper / webapps /
drwxr-xr-x   ..
lrwxrwxrwx 25 solr.war -> ../../dist/solr-4.6.0.war