aboutsummaryrefslogtreecommitdiffstats
path: root/camel/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'camel/ChangeLog')
-rw-r--r--camel/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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