diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-01-17 10:28:13 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-01-17 10:28:13 +0800 |
| commit | ccaf867e8ebc7649d0d440bc2968e62b0553d864 (patch) | |
| tree | 01e762ef9d966c9f5025eb2e08e8a1b999b752b9 /mail | |
| parent | 45473b5ef28f7819d07f367cf22995fcd94c6ffc (diff) | |
| download | gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.tar gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.tar.gz gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.tar.bz2 gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.tar.lz gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.tar.xz gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.tar.zst gsoc2013-evolution-ccaf867e8ebc7649d0d440bc2968e62b0553d864.zip | |
fixed merge conflicts
svn path=/trunk/; revision=19501
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 10bb0b8b5d..ab971296ec 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -45,7 +45,6 @@ * mail-local.c (save_metainfo): Back to using e_xml_save_file(). ->>>>>>> 1.2540 2003-01-14 Ettore Perazzoli <ettore@ximian.com> * message-tag-editor.c (message_tag_editor_init): Make dialog |