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