OC-1701: Conflict detected in keep-in-sync
[pub/Android/ownCloud.git] / res / values-pt-rBR /
drwxr-xr-x   ..
-rw-r--r-- 23471 strings.xml