From e558623852f70eb0463f0ea69e9cda672e0fc74d Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@xiph.org>
Date: Tue, 22 Nov 2005 16:33:29 +0000
Subject: [PATCH] Remove conflict marker

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

diff --git a/ChangeLog b/ChangeLog
index efb3c9a..7696b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,6 @@
 	* gst-libs/gst/audio/audio.h:
 	  remove some deprecated functions
 
->>>>>>> 1.2127
 2005-11-22  Andy Wingo  <wingo@pobox.com>
 
 	* Update for gst_tag_setter API changes.
-- 
2.7.4