From faf1c14c11f3e6026f786e9587715c10b13c723e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 25 Apr 2009 10:16:00 -0400
Subject: Manual conflict resolution

---
 mail/em-utils.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mail/em-utils.c')

diff --git a/mail/em-utils.c b/mail/em-utils.c
index 7e110877fa..2da8efaad2 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2086,7 +2086,6 @@ is_local (ESourceGroup *group)
 	return group &&
 		e_source_group_peek_base_uri (group) &&
 		g_str_has_prefix (e_source_group_peek_base_uri (group), "file://");
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:mail/em-utils.c
 }
 
 gboolean
-- 
cgit v1.2.3