From bbc2a8aa24ec454f94e5dbd38ecea8214e9fb842 Mon Sep 17 00:00:00 2001 From: Jens Braeuer Date: Tue, 4 Oct 2011 15:33:49 +0200 Subject: [PATCH] [aws|cloudwatch] Fix merge error. --- lib/fog/aws/cloud_watch.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/fog/aws/cloud_watch.rb b/lib/fog/aws/cloud_watch.rb index 6b33b5279..a1dd9c12f 100644 --- a/lib/fog/aws/cloud_watch.rb +++ b/lib/fog/aws/cloud_watch.rb @@ -13,7 +13,6 @@ module Fog request :list_metrics request :get_metric_statistics request :put_metric_data -<<<<<<< HEAD request :describe_alarms request :put_metric_alarm request :delete_alarms @@ -22,9 +21,6 @@ module Fog request :disable_alarm_actions request :describe_alarms_for_metric request :set_alarm_state -======= - request :put_metric_alarm ->>>>>>> [aws|cloudwatch] Add support for put-metric-alarm call. model_path 'fog/aws/models/cloud_watch' model :metric