From 2e24bc8d331395afa0b74fb39ef4cd49ad7be78d Mon Sep 17 00:00:00 2001
From: Michael Zucci <zucchi@src.gnome.org>
Date: Tue, 30 May 2000 23:28:18 +0000
Subject: 	Removed merge cruft.

svn path=/trunk/; revision=3302
---
 mail/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 629c69f76e..648c7903a0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -58,7 +58,6 @@
 	(still doesn't work because of ETable.)  Adapt to some small
 	ETable changes.  Set drawfocus to FALSE.
 
->>>>>>> 1.142
 2000-05-29  Not Zed  <NotZed@HelixCode.com>
 
 	* folder-browser.c (folder_browser_load_folder): Hardcode the
-- 
cgit