From ec93568b794d27eff2e6cb3de1f482a547a3d89a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Sun, 1 Dec 2002 18:52:52 +0000 Subject: removed merge conflicts svn path=/trunk/; revision=18970 --- composer/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'composer') 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 * e-msg-composer.c (e_msg_composer_get_sig_file_content): use -- cgit v1.2.3