conflicts

elastic · Sep 21, 2023 · 93558d6 · 93558d6
1 parent bcb1018
commit 93558d6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/testing/integration/upgrade_test.go b/testing/integration/upgrade_test.go
@@ -989,8 +989,6 @@ func removePackageVersionFiles(t *testing.T, f *atesting.Fixture) {
 		require.NoErrorf(t, err, "error removing package version file %q", vFile)
 	}
 }
-<<<<<<< HEAD
-=======
 
 // TestStandaloneUpgradeFailsStatus tests the scenario where upgrading to a new version
 // of Agent fails due to the new Agent binary reporting an unhealthy status. It checks
@@ -1094,4 +1092,3 @@ type CustomPGP struct {
 	PGPUri  string
 	PGPPath string
 }
->>>>>>> b1d2e6b040 ([Bug] Do not fail when remote PGPs are not available (#3427))