From ccaf867e8ebc7649d0d440bc2968e62b0553d864 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Fri, 17 Jan 2003 02:28:13 +0000
Subject: fixed merge conflicts

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

(limited to 'mail/ChangeLog')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 10bb0b8b5d..ab971296ec 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -45,7 +45,6 @@
 
 	* mail-local.c (save_metainfo): Back to using e_xml_save_file().
 
->>>>>>> 1.2540
 2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
 
 	* message-tag-editor.c (message_tag_editor_init): Make dialog
-- 
cgit v1.2.3