Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / conf3 / spellings.txt
1 pizza
2 history