conflicts refactoring
[toast/confclerk.git] / NEWS