From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 4 Aug 2015 15:29:42 +0000 (+0200)
Subject: Updated conflict message (same as in web app)
X-Git-Tag: oc-android-1.8~48^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/156cb5e81b63ca1d3d79ba446a32470aa5e2e78b?hp=156cb5e81b63ca1d3d79ba446a32470aa5e2e78b

Updated conflict message (same as in web app)
---