aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 629c69f76e..648c7903a0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -58,7 +58,6 @@
(still doesn't work because of ETable.) Adapt to some small
ETable changes. Set drawfocus to FALSE.
->>>>>>> 1.142
2000-05-29 Not Zed <NotZed@HelixCode.com>
* folder-browser.c (folder_browser_load_folder): Hardcode the