diff options
| author | Michael Zucci <zucchi@src.gnome.org> | 2000-05-31 07:28:18 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2000-05-31 07:28:18 +0800 |
| commit | 2e24bc8d331395afa0b74fb39ef4cd49ad7be78d (patch) | |
| tree | c71f1aadde0e0ddf6fafcf4312891c1ff939eaf9 /mail/ChangeLog | |
| parent | 9c6a4c53a982c74f66dd5cfa508c7dccf284962c (diff) | |
| download | gsoc2013-evolution-2e24bc8d331395afa0b74fb39ef4cd49ad7be78d.tar.gz gsoc2013-evolution-2e24bc8d331395afa0b74fb39ef4cd49ad7be78d.tar.zst gsoc2013-evolution-2e24bc8d331395afa0b74fb39ef4cd49ad7be78d.zip | |
Removed merge cruft.
svn path=/trunk/; revision=3302
Diffstat (limited to 'mail/ChangeLog')
| -rw-r--r-- | mail/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 629c69f76e..648c7903a0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -58,7 +58,6 @@ (still doesn't work because of ETable.) Adapt to some small ETable changes. Set drawfocus to FALSE. ->>>>>>> 1.142 2000-05-29 Not Zed <NotZed@HelixCode.com> * folder-browser.c (folder_browser_load_folder): Hardcode the |