X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3fd56ecff8c7446e9462e43e899360822d3abb91..69ac5b6bfb63327e64edc718bdcd9a5f2c7c161b:/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

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);