Resolve merge conflict on gemspec
[arvados.git] / spec / fixtures / files /
drwxr-xr-x   ..
-rw-r--r-- 1732 privatekey.p12
-rw-r--r-- 10032 sample.txt
-rw-r--r-- 1034 secret.pem