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