From 5e1e68c06852a560f7b5c4cef88e9b758bd81871 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 2 Mar 2007 13:33:39 +0000
Subject: Remove spurious conflict marker

Original commit message from CVS:

Remove spurious conflict marker
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index f592c9fe..04d714a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,6 @@
 	  Add a new plugin/library to make it easy for apps to shove
 	  data into a pipeline.
 
->>>>>>> 1.2426
 2007-02-26  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init):
-- 
cgit v1.2.1