Merge pull request #71 from twelvelabs/master

fix "already initialized constant" warnings
2013-09-06 11:37:45 -07:00 · 2013-09-06 11:37:45 -07:00 · 8b128286c5
parent 5249137d4c 4143d900e0
commit 8b128286c5
5 changed files with 0 additions and 5 deletions
--- a/bin/google-api
+++ b/bin/google-api
@ -11,7 +11,6 @@ OAUTH_SERVER_PORT = 12736
 require 'rubygems'
 require 'optparse'
 require 'faraday'
-require 'faraday/utils'
 require 'webrick'
 require 'google/api_client/version'
 require 'google/api_client'
--- a/lib/google/api_client.rb
+++ b/lib/google/api_client.rb
@ -14,7 +14,6 @@


 require 'faraday'
-require 'faraday/utils'
 require 'multi_json'
 require 'compat/multi_json'
 require 'stringio'
--- a/lib/google/api_client/request.rb
+++ b/lib/google/api_client/request.rb
@ -13,7 +13,6 @@
 # limitations under the License.

 require 'faraday'
-require 'faraday/utils'
 require 'faraday/request/multipart'
 require 'multi_json'
 require 'compat/multi_json'
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@ -18,7 +18,6 @@
 require 'spec_helper'

 require 'faraday'
-require 'faraday/utils'
 require 'multi_json'
 require 'compat/multi_json'
 require 'signet/oauth_1/client'
--- a/spec/google/api_client_spec.rb
+++ b/spec/google/api_client_spec.rb
@ -15,7 +15,6 @@
 require 'spec_helper'

 require 'faraday'
-require 'faraday/utils'
 require 'signet/oauth_1/client'
 require 'google/api_client'
 require 'google/api_client/version'