Skip to content

Commit

Permalink
Fixing bad merge resolution.
Browse files Browse the repository at this point in the history
  • Loading branch information
rlhagerm committed Dec 30, 2024
1 parent 3bdd578 commit 91dbbb5
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions dotnetv4/AutoScaling/Actions/AutoScalingWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -191,10 +190,6 @@ public async Task<List<AutoScalingGroup>> DescribeAutoScalingGroupsAsync(
{
groups = response.AutoScalingGroups;
}
if (response.AutoScalingGroups != null)
{
groups = response.AutoScalingGroups;
}

return groups;
}
Expand Down

0 comments on commit 91dbbb5

Please sign in to comment.