From f5394d001ea69f0d6a5660c6744580275ebbf9c3 Mon Sep 17 00:00:00 2001
From: Michael Meeks <mmeeks@src.gnome.org>
Date: Mon, 2 Oct 2000 23:31:29 +0000
Subject: remove spurious conflict indicator.

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

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 78537eaa31..26a2ab8a42 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -445,7 +445,6 @@
 	(thread_messages_free): Remove the return, run as is.
 	(prune_empty): Plugged another small leak.
 
->>>>>>> 1.552
 2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* mail-callbacks.c (run_filter_ondemand): Updated to use the new
-- 
cgit