Resolve merge conflict, update rspec syntax and docs
authorSteven Bazyl <sqrrrl@gmail.com>
Mon, 15 Dec 2014 21:41:10 +0000 (13:41 -0800)
committerSteven Bazyl <sqrrrl@gmail.com>
Mon, 15 Dec 2014 21:41:10 +0000 (13:41 -0800)
commit74134bf87384212505a73ba02843134a785e18e1
treeb45b49487cdd586221b97ad9ea5f5b944595b924
parent9b0e8d3f85d77e8b6550a26c78db26cc36020c27
parent2f88bc5487b29cbf90e5a37fc044fe33900609fe
Resolve merge conflict, update rspec syntax and docs
lib/google/api_client.rb
spec/google/api_client_spec.rb