Resolve merge conflict
[arvados.git] / spec / google / api_client /
drwxr-xr-x   ..
-rw-r--r-- 7428 batch_spec.rb
-rw-r--r-- 22097 discovery_spec.rb
-rw-r--r-- 4762 media_spec.rb
-rw-r--r-- 5547 result_spec.rb
-rw-r--r-- 1974 service_account_spec.rb