Removed conflict mark
[pub/Android/ownCloud.git] / res / values-gl /
drwxr-xr-x   ..
-rw-r--r-- 21256 strings.xml