From 5eb6eb4da8609b667d6318811afc45ce5a81f091 Mon Sep 17 00:00:00 2001 From: Jens Braeuer Date: Tue, 4 Oct 2011 15:31:05 +0200 Subject: [PATCH] Fix merge error. --- lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb index 6187dd58f..8afb02816 100644 --- a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb +++ b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb @@ -1,17 +1,13 @@ module Fog module AWS class CloudWatch -<<<<<<< HEAD -======= - ->>>>>>> Minor whitespace change. class Real require 'fog/aws/parsers/cloud_watch/put_metric_alarm' # Creates or updates an alarm and associates it with the specified Amazon CloudWatch metric # ==== Options # * ActionsEnabled<~Boolean>: Indicates whether or not actions should be executed during any changes to the alarm's state - # * AlarmActions<~Array>: A list of actions to execute + # * AlarmActions<~Array>: A list of actions to execute # * AlarmDescription<~String>: The description for the alarm # * AlarmName<~String> The unique name for the alarm # * ComparisonOperator<~String>: The arithmetic operation to use for comparison