From: David A. Velasco Date: Fri, 30 Oct 2015 12:59:02 +0000 (+0100) Subject: Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version X-Git-Tag: oc-android-1.9^2~37^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/09a349346c331f88e0e61d9f306d7344dcccbf71?hp=--cc Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog --- 09a349346c331f88e0e61d9f306d7344dcccbf71