Skip to content

Commit 2eec883

Browse files
committed
Merge Conflict
1 parent 8da70da commit 2eec883

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ function Test-RemoveAzureBackupProtectionPolicyTests
9595

9696
$vault = Get-AzureRmBackupVault -Name $ResourceName;
9797
$protectionPolicy = Get-AzureRmBackupProtectionPolicy -vault $vault -Name $PolicyName
98-
98+
9999
Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -Force
100100
}

src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ProtectionPolicyHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ private static IList<Day> ConvertToCSMDayList(List<string> DaysOfMonth)
763763
foreach (string DayOfMonth in DaysOfMonth)
764764
{
765765
Day day = new Day();
766-
if (string.Compare(DayOfMonth,"Last", true) == 0)
766+
if (string.Compare(DayOfMonth, LastDayOfTheMonth, true) == 0)
767767
{
768768
day.IsLast = true;
769769
}

0 commit comments

Comments
 (0)