Remove conflict badge from ancestors when conflict is solved there are no more confli...
[pub/Android/ownCloud.git] / automationTest / src /
drwxr-xr-x   ..
drwxr-xr-x - test