aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a747ee4f49..44db106a97 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -39,7 +39,6 @@
* e-msg-composer-hdrs.c (entry_changed): duh, emit the signal
using an initialised value(!).
->>>>>>> 1.470
2002-11-19 Radek Doulik <rodo@ximian.com>
* e-msg-composer.c (e_msg_composer_get_sig_file_content): use