Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 15:59:12 +0000 (17:59 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 15:59:12 +0000 (17:59 +0200)
commit08d02058c83f2344304a9be9a8ca10525163163d
tree54ccaf20c21a4ae09a78697becf48b38ae9a56e8
parent9494620cc4f61450223658e703f16bfa63248522
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
src/com/owncloud/android/operations/UploadFileOperation.java