mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Removed merge commit
This commit is contained in:
parent
040d132f9a
commit
61da0e15be
2 changed files with 0 additions and 13 deletions
|
@ -1,8 +1,5 @@
|
|||
require 'fog/core/model'
|
||||
|
||||
# XXX
|
||||
require 'pp'
|
||||
|
||||
module Fog
|
||||
module Compute
|
||||
class AWS
|
||||
|
|
|
@ -7,7 +7,6 @@ module Fog
|
|||
|
||||
def end_element(name)
|
||||
case name
|
||||
<<<<<<< HEAD
|
||||
when 'return'
|
||||
if value == 'true'
|
||||
@response[name] = true
|
||||
|
@ -19,15 +18,6 @@ module Fog
|
|||
end
|
||||
end
|
||||
end
|
||||
=======
|
||||
when 'requestId', 'return', 'groupId'
|
||||
@response[name] = value
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
>>>>>>> de807f03b1890ea0fe65f98852e607a0d284e762
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue