From 2c72dd78a271397af45e0e0ea66e5e78ea7364c6 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Wed, 24 Oct 2001 04:10:01 +0000
Subject: fixed changelog

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

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e6ec5faf18..c32aff77b1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -45,7 +45,6 @@
 	(folder_browser_ui_set_selection_state): And here too.
 
 2001-10-23  Jeffrey Stedfast  <fejj@ximian.com>
->>>>>>> 1.1890
 
 	* mail-account-gui.c (service_check_supported): Don't allow an
 	auth-type to be set when saving the service.
-- 
cgit v1.2.3