From: masensio <masensio@solidgear.es>
Date: Mon, 14 Oct 2013 10:48:26 +0000 (+0200)
Subject: OC-1701: Conflict detected in keep-in-sync
X-Git-Tag: oc-android-1.5.5~155^2~15^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/98d95b576ead4119ec16719a72d83ca6db82b77a?hp=98d95b576ead4119ec16719a72d83ca6db82b77a

OC-1701: Conflict detected in keep-in-sync
---