aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
1 files changed, 0 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 66b63e3c35..70ce338611 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,11 +1,7 @@
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
2000-08-09 Not Zed <NotZed@HelixCode.com>
* mail-autofilter.c: New file to hold auto filter/vfolder stuff.
-=======
-=======
2000-08-09 Christopher James Lahey <clahey@helixcode.com>
* mail-display.c, mail-format.c, mail-ops.c: Fixed some warnings.
@@ -18,7 +14,6 @@
* folder-browser-factory.c (control_activate): Create a "print
message" menu item.
->>>>>>> 1.381
2000-08-09 Jeffrey Stedfast <fejj@helixcode.com>
* message-list.c (message_list_init): Attached a double_click