From 3abd8a559ebc12949040a631381ba22be480a8f1 Mon Sep 17 00:00:00 2001
From: Christian Schaller <uraeus@gnome.org>
Date: Sun, 7 Mar 2004 11:26:27 +0000
Subject: [PATCH] remove conflict indicators

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

diff --git a/ChangeLog b/ChangeLog
index 7067212803..56f0e42001 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):