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)
commit07974d88695f70211f38fff18ce293e2c4d40c3f
tree37574b622adecb794245e0c7b01da6aeabad96a2
parentb5815881276231fa63d25d6673b2116f44790651
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