From 92e14ae1794837d0a4390f969804562c0108033c Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Mon, 16 Oct 2000 23:49:29 +0000
Subject: fixed ChangeLog merge-conflict errors

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

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index bfea5d1f9c..f95efdadad 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -255,7 +255,6 @@
 	`mail-search-dialogue.h' and `mail-search-dialogue.c' as NotZed
 	forgot to put them into CVS.
 
->>>>>>> 1.631
 2000-10-06  Not Zed  <NotZed@HelixCode.com>
 
 	* mail-search-dialogue.c: New widget, full search dialogue for
@@ -447,7 +446,6 @@
 	* mail-ops.c (do_scan_subfolders): Don't try to add_folders if
 	get_folder_info returned NULL.
 
->>>>>>> 1.611
 2000-10-04  Not Zed  <NotZed@HelixCode.com>
 
 	* message-list.c (message_list_init_header): Fix the attachment
-- 
cgit v1.2.3