Resolve merge conflict

This commit is contained in:
Steven Bazyl committed 2014-12-17 12:39:57 -08:00
commit 8e49ee764b
4 files changed
+121 -25

No files matched your search

+5
View File
@@ -43,6 +43,11 @@ module Google
class ClientError < TransmissionError
end
##
# A 401 HTTP error occurred.
class AuthorizationError < ClientError
end
##
# A 5xx class HTTP error occurred.
class ServerError < TransmissionError