Date: Sunday June 17, 2001 @ 19:31 Author: dres Update of /home/cvs/cvsroot/gnucash In directory www.linas.org:/tmp/cvs-serv18231 Modified Files: ChangeLog Log Message: remove conflict indicator.