aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2002-07-17 04:22:49 +0800
committerPeter Williams <peterw@src.gnome.org>2002-07-17 04:22:49 +0800
commit8535245dde06ffb9b5f9679ca9e5e5944fffc3e5 (patch)
tree692e9e2dfc2a1eacce62426c9e5a5178828cd886 /mail
parentbc20187dc0782187ccedec5edd9c744ce652a803 (diff)
downloadgsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.tar
gsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.tar.gz
gsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.tar.bz2
gsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.tar.lz
gsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.tar.xz
gsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.tar.zst
gsoc2013-evolution-8535245dde06ffb9b5f9679ca9e5e5944fffc3e5.zip
Remove a stray conflict marker.
svn path=/trunk/; revision=17481
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 97a2dc0f27..f525fd7e68 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -258,7 +258,6 @@
* mail-format.c (handle_multipart_related): Make sure that cid is
non-NULL.
->>>>>>> 1.2245
2002-07-01 Not Zed <NotZed@Ximian.com>
* mail-folder-cache.c (folder_deleted): Removed. The