diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-07 02:32:19 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-07 02:32:19 +0800 |
| commit | b9c958eaaa2adbf79724a4709ff2b82158f53dc6 (patch) | |
| tree | 5c400533bbde38426bfe625361b8de773506c2c3 /mail | |
| parent | abf50455e043e970747d96c4bcf547912f926203 (diff) | |
| download | gsoc2013-evolution-b9c958eaaa2adbf79724a4709ff2b82158f53dc6.tar.gz gsoc2013-evolution-b9c958eaaa2adbf79724a4709ff2b82158f53dc6.tar.zst gsoc2013-evolution-b9c958eaaa2adbf79724a4709ff2b82158f53dc6.zip | |
fixed changelog merge conflicts
svn path=/trunk/; revision=14906
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 45bb07330f..0acee52114 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -42,7 +42,6 @@ * mail-display.c (load_content_loaded): Make sure the mail-display object is still "alive" before accessing any of it's data. ->>>>>>> 1.1943.2.6 2001-11-14 Zbigniew Chyla <cyba@gnome.pl> * mail-autofilter.c (rule_match_recipients, rule_from_message, |