Detect conflict when local and server version are changed
authormasensio <masensio@solidgear.es>
Thu, 29 Oct 2015 16:13:24 +0000 (17:13 +0100)
committermasensio <masensio@solidgear.es>
Thu, 29 Oct 2015 16:13:24 +0000 (17:13 +0100)
commit3444d61be813114be86c0a77d364189013c12e32
treedb5c026ad4b190041247f3daa1fb48487498bc7a
parentbcfa07f565b675143b70e665aa7bed896e642364
Detect conflict when local and server version are changed
src/com/owncloud/android/operations/SynchronizeFolderOperation.java