Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / debian / compat
1 7