Resolve merge conflict
[arvados.git] / spec / fixtures / files /
drwxr-xr-x   ..
-rw-r--r-- 10032 sample.txt