aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-utils.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
commitfaf1c14c11f3e6026f786e9587715c10b13c723e (patch)
tree3dbf5816532cbea2510b4438c7c40d91fc426d3a /mail/em-folder-utils.c
parent86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff)
downloadgsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip
Manual conflict resolution
Diffstat (limited to 'mail/em-folder-utils.c')
-rw-r--r--mail/em-folder-utils.c1
1 files changed, 0 insertions, 1 deletions
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);