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 ab19aa1666..4ff010ecb8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -25,7 +25,6 @@
* mail-mt.c (mail_call_main): new generic interface for calling
stuff/proxying in the gui thread.
->>>>>>> 1.1832
2001-10-14 Jon Trowbridge <trow@ximian.com>
* e-searching-tokenizer.c (e_searching_tokenizer_clone): Share