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/mail-session.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'mail/mail-session.c')

diff --git a/mail/mail-session.c b/mail/mail-session.c
index b1776664fb..58b675828a 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -750,12 +750,6 @@ mail_session_shutdown (void)
 	camel_shutdown ();
 }
 
-void
-mail_session_shutdown (void)
-{
-	camel_shutdown ();
-}
-
 gboolean
 mail_session_get_interactive (void)
 {
-- 
cgit