Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / etc / init.d /
2014-03-04 Dennis SchafrothFix start
2013-11-29 Dennis Schafrothinit.d script