From 0d67d991519878334dc442b909f70bceb7f52812 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@gnome.org>
Date: Fri, 7 May 2004 00:45:12 +0000
Subject: cvs commit: warning: file 'ChangeLog' seems to still contain conflict
 indicators

Original commit message from CVS:
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 465227e8..ce50411b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,7 +111,6 @@
 	* ext/lame/gstlame.c:
 	correct defaults that lame_init puts out of range
 
->>>>>>> 1.601
 2004-05-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/divx/gstdivxenc.c: (gst_divxenc_get_type),
-- 
cgit v1.2.1