diff options
-rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index aaee376408..902a16ecf9 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -35,7 +35,6 @@ * em-format-hook.c (emfh_format_format): if we are disabled, don't invoke handler, try to invoke old handler if there was one. ->>>>>>> 1.3608 2005-03-10 Not Zed <NotZed@Ximian.com> ** See bug #73293 |