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 78537eaa31..26a2ab8a42 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -445,7 +445,6 @@
(thread_messages_free): Remove the return, run as is.
(prune_empty): Plugged another small leak.
->>>>>>> 1.552
2000-09-11 Jeffrey Stedfast <fejj@helixcode.com>
* mail-callbacks.c (run_filter_ondemand): Updated to use the new