aboutsummaryrefslogtreecommitdiffstats
path: root/mail/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'mail/ChangeLog')
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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.