From 44216ee03c710333c62dcce0d65ff57b2717d888 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Thu, 17 Mar 2005 19:00:00 +0000
Subject: fixed

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

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index aaee376408..902a16ecf9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -35,7 +35,6 @@
 	* em-format-hook.c (emfh_format_format): if we are disabled, don't
 	invoke handler, try to invoke old handler if there was one.
 
->>>>>>> 1.3608
 2005-03-10  Not Zed  <NotZed@Ximian.com>
 
 	** See bug #73293
-- 
cgit v1.2.3