From 91e222df936320421cb9601bcc70bba9f58dacf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Wed, 20 Sep 2006 10:42:34 +0000
Subject: [PATCH] ChangeLog surgery: remove junk

Original commit message from CVS:
ChangeLog surgery: remove junk
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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: