diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-10-17 07:49:29 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-10-17 07:49:29 +0800 |
| commit | 92e14ae1794837d0a4390f969804562c0108033c (patch) | |
| tree | ba13e80529066f58e5b8989550f5e420637a2657 /mail | |
| parent | 1eae52cc666f55142c4580637e3a42c1db2805b7 (diff) | |
| download | gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.tar gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.tar.gz gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.tar.bz2 gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.tar.lz gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.tar.xz gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.tar.zst gsoc2013-evolution-92e14ae1794837d0a4390f969804562c0108033c.zip | |
fixed ChangeLog merge-conflict errors
svn path=/trunk/; revision=5956
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index bfea5d1f9c..f95efdadad 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -255,7 +255,6 @@ `mail-search-dialogue.h' and `mail-search-dialogue.c' as NotZed forgot to put them into CVS. ->>>>>>> 1.631 2000-10-06 Not Zed <NotZed@HelixCode.com> * mail-search-dialogue.c: New widget, full search dialogue for @@ -447,7 +446,6 @@ * mail-ops.c (do_scan_subfolders): Don't try to add_folders if get_folder_info returned NULL. ->>>>>>> 1.611 2000-10-04 Not Zed <NotZed@HelixCode.com> * message-list.c (message_list_init_header): Fix the attachment |