Update magefile.go

elastic · Mar 14, 2024 · d149c33 · d149c33
1 parent 4bda3aa
commit d149c33
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/x-pack/packetbeat/magefile.go b/x-pack/packetbeat/magefile.go
@@ -110,8 +110,6 @@ func Ironbank() error {
 func TestPackages() error {
 	return devtools.TestPackages()
 }
-<<<<<<< HEAD
-=======
 
 func SystemTest(ctx context.Context) error {
 	mg.SerialDeps(getNpcapInstaller, devtools.BuildSystemTestBinary)
@@ -159,4 +157,3 @@ func getNpcapInstaller() error {
 	fmt.Printf("getting %s from private cache\n", installer)
 	return sh.RunV("gsutil", "cp", "gs://"+ciBucketName+"/private/"+installer, dstPath)
 }
->>>>>>> e0d5fe5fef (Migrate xpack packetbeat (#38135))