aboutsummaryrefslogtreecommitdiffstats
path: root/camel/ChangeLog
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2002-09-19 10:38:20 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-09-19 10:38:20 +0800
commit7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8 (patch)
treec43709aba9db1be3fd613dcd4977cccc5578be31 /camel/ChangeLog
parent13c01546e5deccb285f37118e29744d8dc6f07b4 (diff)
downloadgsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar
gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.gz
gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.bz2
gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.lz
gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.xz
gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.zst
gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.zip
fixed a merge conflict
svn path=/trunk/; revision=18109
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