Updated conflict message (same as in web app)
[pub/Android/ownCloud.git] / src /
drwxr-xr-x   ..
drwxr-xr-x - com
drwxr-xr-x - third_parties