From f8f95421a6e00884da54c9da66d6c0b0edc00e29 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 15 Mar 2002 22:52:23 +0000
Subject: Commit ChangeLog.

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

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 73fdb90ed4..005e0d7933 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -43,7 +43,6 @@
 	default size of the window, so we don't get this itty-bitty window
 	the size of a quarter on the screen when it first gets shown.
 
->>>>>>> 1.2080
 2002-03-12  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-display.c (on_link_clicked): Handle digest: urls.
-- 
cgit v1.2.3