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 e0149b20dc..6e09d51153 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -48,7 +48,6 @@
2001-07-06 Peter Williams <peterw@ximian.com>
->>>>>>> 1.1360
* mail-callbacks.c (composer_postpone_cb): Don't free the psd here --
it will be freed on the "destroy" signal.