X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/001801a39b1d0179db4df37e4691364525427080..b9ef747a0be9e50d50b709474daf9dca47d60f5f:/src/com/owncloud/android/operations/UploadFileOperation.java diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index 09c4581e..0bc990ff 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -361,7 +361,7 @@ public class UploadFileOperation extends RemoteOperation { } } else if (result.getHttpCode() == HttpStatus.SC_PRECONDITION_FAILED ) { - result = new RemoteOperationResult(ResultCode.CONFLICT); + result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT); } } catch (Exception e) {