From 491c9ab3e01ff3aa8136cb10a953a308e48cf7cd Mon Sep 17 00:00:00 2001
From: Martin Soto <martinsoto@users.sourceforge.net>
Date: Thu, 24 Nov 2005 13:58:55 +0000
Subject: [PATCH] Erase old CVS conflict line.

Original commit message from CVS:
Erase old CVS conflict line.
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cc45c81e06..f0db346c38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,7 +96,6 @@
 	* ext/mad/Makefile.am:
 	  libgsttagedit => libgsttag
 
->>>>>>> 1.1895
 2005-11-22  Edward Hervey  <edward@fluendo.com>
 
 	* ext/lame/gstlame.c: (gst_lame_sink_event):