diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-12-02 02:52:52 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-12-02 02:52:52 +0800 |
| commit | ec93568b794d27eff2e6cb3de1f482a547a3d89a (patch) | |
| tree | 038d9c85e4c317cf9ebde9d2a0881766581cd86b | |
| parent | b625bdfa469c665eb871afe58b6145954ce911ea (diff) | |
| download | gsoc2013-evolution-ec93568b794d27eff2e6cb3de1f482a547a3d89a.tar.gz gsoc2013-evolution-ec93568b794d27eff2e6cb3de1f482a547a3d89a.tar.zst gsoc2013-evolution-ec93568b794d27eff2e6cb3de1f482a547a3d89a.zip | |
removed merge conflicts
svn path=/trunk/; revision=18970
| -rw-r--r-- | composer/ChangeLog | 1 |
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 |