Persist conflicts in local database and show with an icon in the list of files
[pub/Android/ownCloud.git] / automationTest / resources /
drwxr-xr-x   ..
-rw-r--r-- 70 .gitignore