Remove merge conflict artifacts

pester · Apr 28, 2024 · a08eb61 · a08eb61
1 parent 04e4a99
commit a08eb61
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/functions/TestResults.NUnit3.ps1 b/src/functions/TestResults.NUnit3.ps1
@@ -19,13 +19,8 @@ function Write-NUnit3Report([Pester.Run] $Result, [System.Xml.XmlWriter] $XmlWri
 }
 
 function Write-NUnit3TestRunAttributes {
-<<<<<<< Updated upstream
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '')]
-    param($Result, [System.Xml.XmlWriter] $XmlWriter)
-=======
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns','')]
     param([Pester.Run] $Result, [System.Xml.XmlWriter] $XmlWriter)
->>>>>>> Stashed changes
 
     $XmlWriter.WriteAttributeString('id', '0')
     $XmlWriter.WriteAttributeString('name', $Result.Configuration.TestResult.TestSuiteName.Value) # required attr. in schema, but not in docs or nunit-console output...