From: masensio <masensio@solidgear.es>
Date: Thu, 14 Nov 2013 16:23:25 +0000 (+0100)
Subject: Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat... 
X-Git-Tag: oc-android-1.5.5~123^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f299079851589e2af2d4aa93a77eecda6438b004?ds=inline;hp=--cc

Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
---

f299079851589e2af2d4aa93a77eecda6438b004
diff --cc oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
index b11c6084,f25c22ed..5ee07d79
--- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
+++ b/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
@@@ -54,7 -56,7 +56,11 @@@ public class CreateRemoteFolderOperatio
          RemoteOperationResult result = null;
          MkColMethod mkcol = null;
          
++<<<<<<< HEAD
 +        boolean noInvalidChars = FileUtils.validateName(mRemotePath, true);
++=======
+         boolean noInvalidChars = FileUtils.validateName(mFolderName);
++>>>>>>> refactor_remote_operation_to_create_folder
          if (noInvalidChars) {
          	try {
          		mkcol = new MkColMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));