From f5e3f97ef1591ebe1fc814f188aae5d69f6d7d55 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 25 Jul 2014 08:45:39 +0200 Subject: [PATCH] Removed conflict mark --- src/com/owncloud/android/utils/ErrorMessageAdapter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java index ebdadc18..5307d468 100644 --- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java +++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java @@ -69,9 +69,8 @@ public class ErrorMessageAdapter { /* } else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) { message = res.getString(R.string.failed_upload_quota_exceeded_text); -<<<<<<< HEAD - */ + } else if (result.getCode() == ResultCode.FORBIDDEN) { message = String.format(res.getString(R.string.forbidden_permissions), res.getString(R.string.uploader_upload_forbidden_permissions)); -- 2.11.0