From 69ac5b6bfb63327e64edc718bdcd9a5f2c7c161b Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 20 Nov 2012 11:40:58 +0100
Subject: [PATCH] ConlictsResolveActivity is finished when the user cancels the
 ConflictsResolverDialog

---
 src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index 057e0417..48676541 100644
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -62,6 +62,7 @@ public class ConflictsResolveActivity extends SherlockFragmentActivity implement
         
         switch (decision) {
             case CANCEL:
+                finish();
                 return;
             case OVERWRITE:
                 i.putExtra(FileUploader.KEY_FORCE_OVERWRITE, true);
-- 
2.11.0