From 4c43a3273d1ed065a75f2334d6dfdb1cda79c11d Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Tue, 29 Nov 2005 15:15:38 +0000
Subject: [PATCH] Fix conflict marker

Original commit message from CVS:
Fix conflict marker
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7ff9514b5d..5117aeb0fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,7 +29,6 @@
 	* gst/gstghostpad.c: (gst_proxy_pad_get_target):
 	  Don't ref NULL target pad (#322751). Improve docs.
 
->>>>>>> 1.2041
 2005-11-29  Michael Smith  <msmith@fluendo.com>
 
 	* gst/gstregistryxml.c: (load_plugin):