diff options
| author | Jon Trowbridge <trow@src.gnome.org> | 2001-07-07 13:41:00 +0800 |
|---|---|---|
| committer | Jon Trowbridge <trow@src.gnome.org> | 2001-07-07 13:41:00 +0800 |
| commit | b950c435e47637e109a1b5c4916024b5c7e322eb (patch) | |
| tree | e0b9b3d92c2596993c316fe80efd397a1ee627e8 /mail | |
| parent | 200f21429939f2b27591bb0c5264c9d6e9ca8e0a (diff) | |
| download | gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.gz gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.bz2 gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.lz gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.xz gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.tar.zst gsoc2013-evolution-b950c435e47637e109a1b5c4916024b5c7e322eb.zip | |
Removed old CVS conflict marker.
svn path=/trunk/; revision=10879
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 e0149b20dc..6e09d51153 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -48,7 +48,6 @@ 2001-07-06 Peter Williams <peterw@ximian.com> ->>>>>>> 1.1360 * mail-callbacks.c (composer_postpone_cb): Don't free the psd here -- it will be freed on the "destroy" signal. |