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)
commitb1baf7d48434b326e8cf5ed67412b6e55d1bb336
treefb353d1fa55a788e0cfe5a52262c8df15373d230
parentc1ff34505bca5c90e85d18f9ba1973ad3658b7e0
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