aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-08-09 13:56:30 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-08-09 13:56:30 +0800
commitcae0d7fb4539887d009aa0803b5fdcb5537ee1d5 (patch)
treead3d66ff825da0428df8da10a0989296dd468075
parent21b756aa3c3541834383013d8bd1e972f758ad1c (diff)
downloadgsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.gz
gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.tar.zst
gsoc2013-evolution-cae0d7fb4539887d009aa0803b5fdcb5537ee1d5.zip
Remove conflict marks.
svn path=/trunk/; revision=4640
-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