From 7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Thu, 19 Sep 2002 02:38:20 +0000
Subject: fixed a merge conflict

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

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 419c8754a9..68ef5df23b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -352,7 +352,6 @@
 	(imap_mailbox_decode): use camel_utf7/8* functions instead.
 	: Add config.h and alloca.h headers.
 
->>>>>>> 1.1620.2.1
 2002-08-20  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* providers/imap/camel-imap-store.c (imap_noop): Override the
-- 
cgit v1.2.3