1 files changed, 0 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f592c9fe..04d714a6 100644
--- 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):