From 6eed3b54660d0720adc24bd6ac18789b49422ae6 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Thu, 11 Oct 2001 16:47:37 +0000
Subject: blah

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

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8db32791ab..c4321aed28 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -62,7 +62,6 @@
 	Should fix #11981.
 
 2001-10-09  Jeffrey Stedfast  <fejj@ximian.com>
->>>>>>> 1.1813
 
 	* folder-browser.c (done_message_selected): Make sure the
 	mail-display is non-NULL.
-- 
cgit v1.2.3