Put back newlines in Conflict responses.
[pithos] / pithos / settings.d / 00-site.conf
2011-11-24 Giorgos VerigakisSplit settings into multiple files