aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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