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

diff --git a/ChangeLog b/ChangeLog
index 465227e..ce50411 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,7 +111,6 @@
        * ext/lame/gstlame.c:
        correct defaults that lame_init puts out of range
 
->>>>>>> 1.601
 2004-05-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * ext/divx/gstdivxenc.c: (gst_divxenc_get_type),