Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / .gitignore
1 *~
2 data
3 install-stamp