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-folder-utils.c | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 64e9dcf117..ff93c9b5a9 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -403,7 +403,6 @@ em_folder_utils_delete_folder (CamelFolder *folder)
 {
 	CamelStore *local_store;
 	GtkWidget *dialog;
-	char *uri;
 	int flags = 0;
 
 	local_store = e_mail_shell_module_get_local_store (mail_shell_module);
-- 
cgit v1.2.3