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