Remove conflict badge from ancestors when conflict is solved there are no more confli...
[pub/Android/ownCloud.git] / oc_jb_workaround / res /
drwxr-xr-x   ..
drwxr-xr-x - drawable-hdpi
drwxr-xr-x - drawable-ldpi
drwxr-xr-x - drawable-mdpi
drwxr-xr-x - values
drwxr-xr-x - xml