Merge Conflict

pragrawa · pragrawa · commit 58dfc04df2bb · 2015-09-23T22:00:12.000+05:30
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1 b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1
@@ -93,7 +93,7 @@ function Test-SetAzureBackupProtectionPolicyTests
 function Test-RemoveAzureBackupProtectionPolicyTests
 {	
 
-	$vault = Get-AzureRMBackupVault -Name $ResourceName -Force;
+	$vault = Get-AzureRMBackupVault -Name $ResourceName;
 	$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName
 		
 	Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -Force

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ function Test-SetAzureBackupProtectionPolicyTests`
`93`	`93`	`function Test-RemoveAzureBackupProtectionPolicyTests`
`94`	`94`	`{`
`95`	`95`
`96`		`- $vault = Get-AzureRMBackupVault -Name $ResourceName -Force;`
	`96`	`+ $vault = Get-AzureRMBackupVault -Name $ResourceName;`
`97`	`97`	`$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName`
`98`	`98`
`99`	`99`	`Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -Force`