conflicts updated correctly
[toast/confclerk.git] / INSTALL