Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...
[pub/Android/ownCloud.git] / res / values-oc /
drwxr-xr-x   ..
-rw-r--r-- 4461 strings.xml