changed conditions for conflicts
[toast/confclerk.git] / README