diff options
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 280dbcddfe..694fe38f0d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -52,7 +52,6 @@ (destination_folder_handle_motion): Ditto. (destination_folder_handle_drop): Ditto. ->>>>>>> 1.1426 2001-07-19 Not Zed <NotZed@Ximian.com> * mail-local.c (reconfigure_folder_reconfigure): remvoed |