Skip to content

Commit f6ba095

Browse files
committed
Update GetScriptAnalyzerRule.tests.ps1
Fix the merging problem
1 parent d15e701 commit f6ba095

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Tests/Engine/GetScriptAnalyzerRule.tests.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ Describe "TestSeverity" {
118118

119119
It "filters rules based on multiple severity inputs"{
120120
$rules = Get-ScriptAnalyzerRule -Severity Error,Information
121-
<<<<<<< HEAD
122121
$rules.Count | Should be 13
123-
=======
124-
$rules.Count | Should be 12
125-
>>>>>>> c29d7fbafdc3fd3e5a447ec2b33211a3783f3c96
126122
}
127123

128124
It "takes lower case inputs" {
@@ -141,4 +137,4 @@ Describe "TestWildCard" {
141137
$rules = Get-ScriptAnalyzerRule -Name PSDSC* -Severity Information
142138
$rules.Count | Should be 3
143139
}
144-
}
140+
}

0 commit comments

Comments
 (0)