Added conflict icon to folders containing files with conflicts
[pub/Android/ownCloud.git] / automationTest / src / test /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - resources