From 92ca90685521bed0ecbb49d5c18273b6028783ad Mon Sep 17 00:00:00 2001
From: Veerapuram Varadhan <vvaradan@src.gnome.org>
Date: Tue, 20 Dec 2005 10:06:39 +0000
Subject: removed conflict indicators.

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

(limited to 'mail/ChangeLog')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4865064e49..1199243afd 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -110,7 +110,6 @@
 	* em-folder-view.c: (emfv_setting_notify):
 	Respond to the change of /apps/evolution/mail/display/show_deleted and thread_list in gconf.
 
->>>>>>> 1.3748
 2005-12-12  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* em-folder-view.c: Mail Context Menu re-ordered correctly,
-- 
cgit v1.2.3