From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 25 Jul 2014 06:45:39 +0000 (+0200)
Subject: Removed conflict mark
X-Git-Tag: oc-android-1.7.0_signed~245^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f5e3f97ef1591ebe1fc814f188aae5d69f6d7d55?ds=inline;hp=-c

Removed conflict mark
---

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