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 1e6d5f8a3f..5c291b31a1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -149,7 +149,6 @@
* mail-preferences.c: Implements the mailer's Preferences tab in
Anna's new config GUI.
->>>>>>> 1.2089.2.5
2002-03-19 Larry Ewing <lewing@ximian.com>
* mail-display.c: add missing NULL closure data to popup menu