Resolve merge conflict
authorSteven Bazyl <sqrrrl@gmail.com>
Wed, 17 Dec 2014 20:39:57 +0000 (12:39 -0800)
committerSteven Bazyl <sqrrrl@gmail.com>
Wed, 17 Dec 2014 20:39:57 +0000 (12:39 -0800)
commit8e49ee764b483948524b74eff103ce0ba229593b
tree8c1d5aa26fa88e55dada94ee1dac0a5cd96f03b6
parentb9639ee11c7e14faae6ef17fc72882fed42cee9f
parent17092bb129a39e066e704f52416132640eb042c1
Resolve merge conflict
README.md
lib/google/api_client.rb
spec/google/api_client_spec.rb