Put back newlines in Conflict responses.
[pithos] / pithos / ui /
2012-01-19 Antony ChazapisChange license year.
2011-11-04 Giorgos VerigakisAdd a feedback submission target