From cd0111464fecd13de75fe721a29e22a0a358fd0d Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@src.gnome.org>
Date: Mon, 15 Oct 2001 20:41:52 +0000
Subject: conflict droppings

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

(limited to 'mail/ChangeLog')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index ab19aa1666..4ff010ecb8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -25,7 +25,6 @@
 	* mail-mt.c (mail_call_main): new generic interface for calling
 	stuff/proxying in the gui thread.
 
->>>>>>> 1.1832
 2001-10-14  Jon Trowbridge  <trow@ximian.com>
 
 	* e-searching-tokenizer.c (e_searching_tokenizer_clone): Share
-- 
cgit v1.2.3