From faf1c14c11f3e6026f786e9587715c10b13c723e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 25 Apr 2009 10:16:00 -0400 Subject: Manual conflict resolution --- mail/message-list.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mail/message-list.c') diff --git a/mail/message-list.c b/mail/message-list.c index 5ae5ba2232..3386ff4d3b 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -4242,9 +4242,8 @@ regen_list_exec (struct _regen_list_msg *m) if (!was_deleted || (was_deleted && !m->hidedel)) g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for)); + } - if (!was_deleted || (was_deleted && !m->hidedel)) - g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for)); } } } -- cgit v1.2.3