Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
[pub/Android/ownCloud.git] / res / values-cy-rGB /
drwxr-xr-x   ..
-rw-r--r-- 9587 strings.xml