From c536b67a734ebfa42151740988c0fd8f26a8c2de Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Wed, 26 Sep 2001 20:51:19 +0000
Subject: fixed merge conflicts

svn path=/trunk/; revision=13166
---
 camel/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 95c8e363c4..5e30c5670b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -26,7 +26,6 @@
 	thanks to a pedantic.
 
 2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
->>>>>>> 1.1175
 
 	* Makefile.am: Fix Ettore's fix.
 
-- 
cgit v1.2.3