From: masensio <masensio@solidgear.es>
Date: Thu, 29 Oct 2015 16:13:24 +0000 (+0100)
Subject: Detect conflict when local and server version are changed
X-Git-Tag: oc-android-1.9^2~37^2~1^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3444d61be813114be86c0a77d364189013c12e32?hp=3444d61be813114be86c0a77d364189013c12e32

Detect conflict when local and server version are changed
---