From 6089b2aed2afa10086d49101127f64d237c8c45a Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Thu, 13 Oct 2005 16:34:04 +0000
Subject: [PATCH] foo

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

diff --git a/ChangeLog b/ChangeLog
index 151d785097..3b5807692c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,7 +120,6 @@
 	(gst_file_sink_event), (gst_file_sink_render):
 	Flush before seeking.
 
->>>>>>> 1.1724
 2005-10-12  Andy Wingo  <wingo@pobox.com>
 
 	* gst/gst.c (gst_init_check): Ignore unknown options, as has