Resolve merge conflict
[arvados.git] / spec /
drwxr-xr-x   ..
drwxr-xr-x - fixtures
drwxr-xr-x - google
-rw-r--r-- 26 spec.opts
-rw-r--r-- 137 spec_helper.rb