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