Fixing bad merge resolution.

rlhagerm · rlhagerm · commit 91dbbb50964c · 2024-12-30T08:59:21.000-06:00
diff --git a/dotnetv4/AutoScaling/Actions/AutoScalingWrapper.cs b/dotnetv4/AutoScaling/Actions/AutoScalingWrapper.cs
@@ -101,7 +101,6 @@ public async Task<bool> DescribeAccountLimitsAsync()
     public async Task<List<Activity>> DescribeScalingActivitiesAsync(
         string groupName)
     {
-        var activities = new List<Activity>();
         var activities = new List<Activity>();
         var scalingActivitiesRequest = new DescribeScalingActivitiesRequest
         {
@@ -191,10 +190,6 @@ public async Task<List<AutoScalingGroup>> DescribeAutoScalingGroupsAsync(
         {
             groups = response.AutoScalingGroups;
         }
-        if (response.AutoScalingGroups != null)
-        {
-            groups = response.AutoScalingGroups;
-        }
 
         return groups;
     }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,6 @@ public async Task<bool> DescribeAccountLimitsAsync()`
`101`	`101`	`public async Task<List<Activity>> DescribeScalingActivitiesAsync(`
`102`	`102`	`string groupName)`
`103`	`103`	`{`
`104`		`- var activities = new List<Activity>();`
`105`	`104`	`var activities = new List<Activity>();`
`106`	`105`	`var scalingActivitiesRequest = new DescribeScalingActivitiesRequest`
`107`	`106`	`{`
`@@ -191,10 +190,6 @@ public async Task<List<AutoScalingGroup>> DescribeAutoScalingGroupsAsync(`
`191`	`190`	`{`
`192`	`191`	`groups = response.AutoScalingGroups;`
`193`	`192`	`}`
`194`		`- if (response.AutoScalingGroups != null)`
`195`		`- {`
`196`		`- groups = response.AutoScalingGroups;`
`197`		`- }`
`198`	`193`
`199`	`194`	`return groups;`
`200`	`195`	`}`