From 78cdb79e5a9f464ede40ea1caa373cf46e24de4b Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Fri, 20 Jul 2001 18:26:10 +0000
Subject: er, unbroke changelog

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

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 280dbcddfe..694fe38f0d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -52,7 +52,6 @@
 	(destination_folder_handle_motion): Ditto.
 	(destination_folder_handle_drop): Ditto.
 
->>>>>>> 1.1426
 2001-07-19  Not Zed  <NotZed@Ximian.com>
 
 	* mail-local.c (reconfigure_folder_reconfigure): remvoed
-- 
cgit v1.2.3