From: Christian Schaller <uraeus@gnome.org>
Date: Sat, 25 Sep 2004 14:54:01 +0000 (+0000)
Subject: remove changelog conflict indicators
X-Git-Tag: 1.19.3~511^2~13714
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71cd789935d416ec7b17b41199038338006dc2eb;p=platform%2Fupstream%2Fgstreamer.git

remove changelog conflict indicators

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

diff --git a/ChangeLog b/ChangeLog
index 67f11ef..083c8a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,7 +116,6 @@
 	* gst/multifilesink/gstmultifilesink.h:
 	add support for streamheader in multifilesink
 
->>>>>>> 1.1087
 2004-09-22  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid),
@@ -1428,7 +1427,6 @@
 	* testsuite/alsa/srcstate.c:
 	add test for alsasrc changing state
 
->>>>>>> 1.958
 2004-07-27  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* gst/silence/gstsilence.c: (gst_silence_init), (gst_silence_link),