aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 926733dbf2..073a016148 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -93,7 +93,6 @@
* component-factory.c (factory_destroy): Wait till all views have
gone and then destroy both factories.
->>>>>>> 1.805
2000-12-21 Dan Winship <danw@helixcode.com>
* mail-display.c (pixbuf_for_mime_type): Deal with the possibility