(CAT-1322) - Update Invoke-BundleInstall function

puppetlabs · Sep 12, 2023 · 4547521 · 4547521
1 parent de6e10b
commit 4547521
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/Puppet.Dsc/internal/functions/Invoke-BundleInstall.ps1 b/src/Puppet.Dsc/internal/functions/Invoke-BundleInstall.ps1
@@ -21,11 +21,7 @@ function Invoke-BundleInstall {
     Try {
       $ErrorActionPreference = 'Stop'
       Invoke-PdkCommand -Path $PuppetModuleFolderPath -Command $Command -SuccessFilterScript {
-<<<<<<< HEAD
-        $_ -match 'Bundle complete!'
-=======
         $_ -match "Bundle complete!"
->>>>>>> 3f13b62 ((CAT-1322) - Update Function Success Criteria)
       }
     } Catch {
       $PSCmdlet.ThrowTerminatingError($PSItem)