Resolve merge conflict on gemspec
authorSteven Bazyl <sqrrrl@gmail.com>
Wed, 22 Jan 2014 23:44:04 +0000 (15:44 -0800)
committerSteven Bazyl <sqrrrl@gmail.com>
Wed, 22 Jan 2014 23:44:04 +0000 (15:44 -0800)
commitf3821f99170dfa0e8b2cce8f2bc2b5b82725c45f
treea5e1ac8a1efa3db041a5d52f66067b085575f23a
parenta1eeecf2f8118e2aad8a6345aa7c1afb9cce5a29
parent50ce4df6407461825005180cb89f6caf144bf2d5
Resolve merge conflict on gemspec
Rakefile
google-api-client.gemspec