From feb3551818011d172c312ee357353a0aec472973 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Wed, 23 Apr 2003 18:16:23 +0000
Subject: fixed merge conflicts in ChangeLog

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

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4e850ff49b..7bf58a376b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -33,7 +33,6 @@
 	object bag instead of a hash table for the service 'cache'.
 	(service_cache_remove): Removed, no longer required.
 
->>>>>>> 1.1801
 2003-04-21  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* camel-gpg-context.c (gpg_ctx_parse_status): Don't set seen_eof1
-- 
cgit v1.2.3