elastic
diff --git a/‎.buildkite/bk.integration-fips.pipeline.yml‎
Lines changed: 0 additions & 168 deletions b/‎.buildkite/bk.integration-fips.pipeline.yml‎
Lines changed: 0 additions & 168 deletions
diff --git a/‎.buildkite/scripts/steps/ess.ps1‎
Lines changed: 0 additions & 4 deletions b/‎.buildkite/scripts/steps/ess.ps1‎
Lines changed: 0 additions & 4 deletions
@@ -38,14 +38,10 @@ function ess_up {
   Pop-Location
 }
 
-<<<<<<< HEAD
-function ess_down {  
-=======
 function ess_down {
   param (
       [string]$EssRegion = "gcp-us-west2"
   )
->>>>>>> 6918b7b07 (fix: ESS stack clean up steps (#9832))
   $Workspace = & git rev-parse --show-toplevel
   $TfDir = Join-Path -Path $Workspace -ChildPath "test_infra/ess/"
   $stateFilePath = Join-Path -Path $TfDir -ChildPath "terraform.tfstate"
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,10 @@ function ess_up {`
`38`	`38`	`Pop-Location`
`39`	`39`	`}`
`40`	`40`
`41`		`-<<<<<<< HEAD`
`42`		`-function ess_down {`
`43`		`-=======`
`44`	`41`	`function ess_down {`
`45`	`42`	`param (`
`46`	`43`	`[string]$EssRegion = "gcp-us-west2"`
`47`	`44`	`)`
`48`		`->>>>>>> 6918b7b07 (fix: ESS stack clean up steps (#9832))`
`49`	`45`	`$Workspace = & git rev-parse --show-toplevel`
`50`	`46`	`$TfDir = Join-Path -Path $Workspace -ChildPath "test_infra/ess/"`
`51`	`47`	`$stateFilePath = Join-Path -Path $TfDir -ChildPath "terraform.tfstate"`