From 56e5135e5ad332d906642c5bd923bf2fbd6d5296 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Wed, 5 Sep 2001 23:04:56 +0000
Subject: removed conflict stuff

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

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 568b6dcc74..bbddcbce1c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -67,7 +67,6 @@
 
 2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
 
->>>>>>> 1.1649
 	* message-browser.c (message_browser_new): s/Evolution/Ximian
 	Evolution/.
 
-- 
cgit v1.2.3