From aa8a5cb824d4079061fd121d6cc2a0777c99a4dc Mon Sep 17 00:00:00 2001
From: Christian Schaller <uraeus@gnome.org>
Date: Tue, 28 Feb 2006 10:40:01 +0000
Subject: [PATCH] remove conflict indicator

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

diff --git a/ChangeLog b/ChangeLog
index 5ffba41..7002d73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,7 +68,6 @@
 	* ext/annodex/gstskeltag.h:
 	  Deleted; these files aren't used any more either.
 
->>>>>>> 1.2189
 2006-02-25  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/Makefile.am: Fix dist-check.
-- 
2.7.4