From 8535245dde06ffb9b5f9679ca9e5e5944fffc3e5 Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@src.gnome.org>
Date: Tue, 16 Jul 2002 20:22:49 +0000
Subject: Remove a stray conflict marker.

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

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 97a2dc0f27..f525fd7e68 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -258,7 +258,6 @@
 	* mail-format.c (handle_multipart_related): Make sure that cid is
 	non-NULL.
 
->>>>>>> 1.2245
 2002-07-01  Not Zed  <NotZed@Ximian.com>
 
 	* mail-folder-cache.c (folder_deleted): Removed.  The
-- 
cgit v1.2.3