17579: fix for wrong conflict resolution
[arvados-workbench2.git] / etc /
drwxr-xr-x   ..
drwxr-xr-x - arvados