Remove conflict badge from ancestors when conflict is solved there are no more confli...
[pub/Android/ownCloud.git] / res / values-is /
drwxr-xr-x   ..
-rw-r--r-- 2053 strings.xml