From 71c83b40817aa3dcca189f1d40512772b89eae1c Mon Sep 17 00:00:00 2001
From: Michael Zucci <zucchi@src.gnome.org>
Date: Mon, 1 Jul 2002 04:58:49 +0000
Subject: Removed some conflict indicators i missed.

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

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1fe82f5790..849ed97315 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -83,7 +83,6 @@
 	* mail-format.c (handle_multipart_signed): Use the new gpg cipher
 	context.
 
->>>>>>> 1.2235
 2002-06-18  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* message-list.c (message_list_change_first_visible_parent): New
-- 
cgit v1.2.3