diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-19 02:38:20 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-19 02:38:20 +0000 |
| commit | 67a3c4e84e62fa20f30c595771012c33908cf2fb (patch) | |
| tree | 94b4a5aff5df5ce968879f6bde23f93151d874c4 | |
| parent | 60c01bd9d59f8180d1e70045b455a4fdf5a27d8b (diff) | |
| download | evolution-data-server-67a3c4e84e62fa20f30c595771012c33908cf2fb.tar.gz | |
fixed a merge conflict
| -rw-r--r-- | camel/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 419c8754a..68ef5df23 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 |