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 8db32791ab..c4321aed28 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -62,7 +62,6 @@
Should fix #11981.
2001-10-09 Jeffrey Stedfast <fejj@ximian.com>
->>>>>>> 1.1813
* folder-browser.c (done_message_selected): Make sure the
mail-display is non-NULL.