OC-1701: Conflict detected in keep-in-sync
[pub/Android/ownCloud.git] / res / values-large-land /
drwxr-xr-x   ..
-rw-r--r-- 827 bools.xml