From 55b4a94715b6923dc2ecd8ccd64dbe96f42efa98 Mon Sep 17 00:00:00 2001 From: Steven Bazyl Date: Fri, 4 Jan 2013 16:49:27 -0800 Subject: [PATCH] Fix odd conflict with VERSION & logger --- lib/google/api_client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb index bcba0123c..75154a6f2 100644 --- a/lib/google/api_client.rb +++ b/lib/google/api_client.rb @@ -19,8 +19,8 @@ require 'multi_json' require 'compat/multi_json' require 'stringio' -require 'google/api_client/logging' require 'google/api_client/version' +require 'google/api_client/logging' require 'google/api_client/errors' require 'google/api_client/environment' require 'google/api_client/discovery' @@ -94,7 +94,7 @@ module Google end self.user_agent = options[:user_agent] || ( "#{application_string} " + - "google-api-ruby-client/#{VERSION::STRING} " + + "google-api-ruby-client/#{Google::APIClient::VERSION::STRING} " + ENV::OS_VERSION ).strip # The writer method understands a few Symbols and will generate useful