From 7e9fe066648a94d79835ea45c83d536d03e558fe Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@src.gnome.org>
Date: Mon, 15 Jul 2002 14:45:08 +0000
Subject: remove a stray conflict marker

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

(limited to 'mail/ChangeLog')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index ba2c0d3d56..676ed01190 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -175,7 +175,6 @@
 	(add_storage): Only call mail_note_store() if we plan on
 	auto-connecting.
 
->>>>>>> 1.2246
 2002-07-02  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* folder-browser.c (on_right_click): Increase the size of the
-- 
cgit