aboutsummaryrefslogtreecommitdiffstats
path: root/mail/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'mail/ChangeLog')
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1fe82f5790..849ed97315 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -83,7 +83,6 @@
* mail-format.c (handle_multipart_signed): Use the new gpg cipher
context.
->>>>>>> 1.2235
2002-06-18 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c (message_list_change_first_visible_parent): New