callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed old CVS conflict marker.

Browse Source 
svn path=/trunk/; revision=10879
This commit is contained in:
Jon Trowbridge
2001-07-07 05:41:00 +00:00
parent 200f214299
commit b950c435e4
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mail/ChangeLog
View File

@ -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.