Resolve completely trivial alleged conflict that git should have been able to handle...
[lui-solr.git] / zookeeper / etc /
2013-11-29 Dennis SchafrothZookeeper setup