From cae0d7fb4539887d009aa0803b5fdcb5537ee1d5 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 9 Aug 2000 05:56:30 +0000
Subject: Remove conflict marks.

svn path=/trunk/; revision=4640
---
 mail/ChangeLog | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'mail')

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
-- 
cgit v1.2.3