mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Minor whitespace change.
This commit is contained in:
parent
40f8f45c32
commit
c337c630bc
1 changed files with 5 additions and 0 deletions
|
@ -1,6 +1,10 @@
|
||||||
module Fog
|
module Fog
|
||||||
module AWS
|
module AWS
|
||||||
class CloudWatch
|
class CloudWatch
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> Minor whitespace change.
|
||||||
class Real
|
class Real
|
||||||
require 'fog/aws/parsers/cloud_watch/put_metric_alarm'
|
require 'fog/aws/parsers/cloud_watch/put_metric_alarm'
|
||||||
|
|
||||||
|
@ -51,6 +55,7 @@ module Fog
|
||||||
}.merge(options))
|
}.merge(options))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue