X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4160e7e256cc91479a5ec883db32172a91ea8243..44ffdc3fb18b4e229cd10a2c4b521ac1e3d616f8:/src/com/owncloud/android/files/OwnCloudFileObserver.java diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index 5383520e..9b3c8427 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -23,12 +23,13 @@ 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 android.accounts.Account; import android.content.Context; import android.content.Intent;