Fix Select Local Version or Keep Both behaviour when solving file coflict
[pub/Android/ownCloud.git] / res / values-ms-rMY /
drwxr-xr-x   ..
-rw-r--r-- 3497 strings.xml