Resolve merge conflict, update rspec syntax
[arvados.git] / spec / google / api_client / auth / storages /
drwxr-xr-x   ..
-rw-r--r-- 1391 file_store_spec.rb
-rw-r--r-- 2268 redis_store_spec.rb