From: Christian Schaller <uraeus@gnome.org>
Date: Sun, 7 Mar 2004 11:26:27 +0000 (+0000)
Subject: remove conflict indicators
X-Git-Tag: 1.19.3~509^2~15093
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87d5670f80f7d371c098710d5798ba4736ed9604;p=platform%2Fupstream%2Fgstreamer.git

remove conflict indicators

Original commit message from CVS:
remove conflict indicators
---

diff --git a/ChangeLog b/ChangeLog
index 7067212..56f0e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,7 +116,6 @@
 	  make sure to handle the case where there's no current chain
 	  gracefully.
 
->>>>>>> 1.392
 2004-03-05  David Schleef  <ds@schleef.org>
 
 	* ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):