Resolve completely trivial alleged conflict that git should have been able to handle...
-rw-r--r-- 21 .gitignore
-rw-r--r-- 87 IDMETA
-rw-r--r-- 42 NEWS
-rw-r--r-- 1179 README
drwxr-xr-x - conf
drwxr-xr-x - conf3
drwxr-xr-x - debian
drwxr-xr-x - dist
drwxr-xr-x - etc
drwxr-xr-x - lib
-rw-r--r-- 3009 lui-solr.spec
drwxr-xr-x - scripts
drwxr-xr-x - zookeeper