OC-1701: Conflict detected in keep-in-sync
[pub/Android/ownCloud.git] / .tx /
drwxr-xr-x   ..
-rw-r--r-- 3330 config