Remove spurious conflict marker

Original commit message from CVS:

Remove spurious conflict marker

diff --git a/ChangeLog b/ChangeLog
index f592c9f..04d714a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,6 @@
          Add a new plugin/library to make it easy for apps to shove
          data into a pipeline.
 
->>>>>>> 1.2426
 2007-02-26  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init):