[Metricbeat] gcp: fix integration tests (#28364)

elastic · Oct 13, 2021 · f9d6842 · f9d6842
1 parent 0edcc3e
commit f9d6842
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go b/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go
@@ -2,13 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-<<<<<<< HEAD
 // +build integration
 // +build gcp
-=======
-//go:build integration && gcp && billing
-// +build integration,gcp,billing
->>>>>>> e8066e9fb6 ([Metricbeat] gcp: fix integration tests (#28364))
+// +build billing
 
 package billing