Merge pull request googleapis#71 from twelvelabs/master

fix "already initialized constant" warnings
burningTyger · Sep 6, 2013 · 8b12828 · 8b12828
2 parents 5249137 + 4143d90
commit 8b12828
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 5 deletions.
diff --git 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'

diff --git 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'

diff --git 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'

diff --git 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'

diff --git 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'