From 369058452256e3bf1f49be48c95aab44dba56884 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Thu, 9 Feb 2006 12:16:35 +0000
Subject: [PATCH] changelog foo

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

diff --git a/ChangeLog b/ChangeLog
index d80ef629f6..7b38ba7eef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,7 +67,6 @@
 	  frame right at offset 0 and if so suggest mpeg/audio
 	  caps with a very low probability (#153004).
 
->>>>>>> 1.2367
 2006-02-07  Andy Wingo  <wingo@pobox.com>
 
 	* gst/tcp/gsttcpclientsrc.c (gst_tcp_client_src_create): Switch to