From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 18 Nov 2013 13:10:16 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_operation_to_create_folder
X-Git-Tag: oc-android-1.5.5~126^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e1245bbda7894e1a3028d2b54a6918e4bdd46ae2?ds=inline

Merge branch 'develop' into refactor_remote_operation_to_create_folder
---

e1245bbda7894e1a3028d2b54a6918e4bdd46ae2
diff --cc src/com/owncloud/android/files/OwnCloudFileObserver.java
index 47a66b65,964b61c3..68c97e4f
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@@ -20,16 -20,14 +20,14 @@@ package com.owncloud.android.files
  
  import java.io.File;
  
 -import com.owncloud.android.Log_OC;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.operations.RemoteOperationResult;
 +import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
  import com.owncloud.android.operations.SynchronizeFileOperation;
 -import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 +import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 +import com.owncloud.android.utils.Log_OC;
  
- 
- 
  import android.accounts.Account;
  import android.content.Context;
  import android.content.Intent;