cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
authorBenjamin Otte <otte@gnome.org>
Fri, 7 May 2004 00:45:12 +0000 (00:45 +0000)
committerBenjamin Otte <otte@gnome.org>
Fri, 7 May 2004 00:45:12 +0000 (00:45 +0000)
commited474907d4715d6c00cee20d52b9133474de4113
tree59cf98a8206e68a2d7a2f07e7016d19e292c340d
parent952bf6bf5a161051580c0fbaaf53dfb5d77a4402
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators

Original commit message from CVS:
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
ChangeLog