From 8d6ca0bee58d8e1ac2ca511f33c6a2d2f1b1c096 Mon Sep 17 00:00:00 2001
From: Christian Schaller <uraeus@gnome.org>
Date: Sat, 25 Sep 2004 14:54:01 +0000
Subject: [PATCH] remove changelog conflict indicators

Original commit message from CVS:
remove changelog conflict indicators
---
 ChangeLog | 2 --
 1 file changed, 2 deletions(-)

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),
-- 
2.7.4