From b9c958eaaa2adbf79724a4709ff2b82158f53dc6 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 6 Dec 2001 18:32:19 +0000 Subject: fixed changelog merge conflicts svn path=/trunk/; revision=14906 --- mail/ChangeLog | 1 - 1 file changed, 1 deletion(-) 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 * mail-autofilter.c (rule_match_recipients, rule_from_message, -- cgit v1.2.3