From: David A. Velasco Date: Tue, 20 Nov 2012 13:12:32 +0000 (+0100) Subject: Fixed 'keep both' action in conflicts dialog (both resulting file were linked to... X-Git-Tag: oc-android-1.4.3~96 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/195b0092129ba4e38c6bb7981022a63c7a0cdfc4?hp=195b0092129ba4e38c6bb7981022a63c7a0cdfc4 Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device) ---