remove conflict line in changelog

Original commit message from CVS:
remove conflict line in changelog

diff --git a/ChangeLog b/ChangeLog
index 622c33f..89b316f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -292,7 +292,6 @@
        * docs/manual/debugging.xml:
         fix manual for new debugging system
 
->>>>>>> 1.292
 2004-02-25  Andy Wingo  <wingo@pobox.com>
 
        * gst/gstpad.c (gst_pad_link_prepare): Re-add