diff --git a/ChangeLog b/ChangeLog
index 2a327666ea..8e77dcf97c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -196,7 +196,6 @@
 	Make queue_threshold variable big enough to store a uint64 time value.
 	API: playbin::queue-min-threshold property.
 
->>>>>>> 1.2883
 2006-09-15  Wim Taymans  <wim@fluendo.com>
 
 	* configure.ac: