kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Fix merge error.

Browse source
This commit is contained in:
Jens Braeuer 2011-10-04 15:31:05 +02:00
parent c27c7d4ddd
commit 5eb6eb4da8
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb
View file

@ -1,10 +1,6 @@
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'