diff options
Diffstat (limited to 'mail/ChangeLog')
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4865064e49..1199243afd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -110,7 +110,6 @@ * em-folder-view.c: (emfv_setting_notify): Respond to the change of /apps/evolution/mail/display/show_deleted and thread_list in gconf. ->>>>>>> 1.3748 2005-12-12 Karsten Bräckelmann <guenther@rudersport.de> * em-folder-view.c: Mail Context Menu re-ordered correctly, |