Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / dist /
drwxr-xr-x   ..
-rw-r--r-- 29435899 solr-4.9.1.war