Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / NEWS
2015-04-22 Jakub SkoczenFix NEWS, IDMETA
2013-01-30 Dennis Schafrothnew NEWS