Update metrics_requester_test.go

elastic · Dec 21, 2023 · 4974d99 · 4974d99
1 parent 128ebfe
commit 4974d99
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go
@@ -9,11 +9,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-<<<<<<< HEAD
-=======
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/protobuf/types/known/durationpb"
->>>>>>> b59a8f4769 (Replace EOL modules: github.com/golang/protobuf by google.golang.org/protobuf (#37212))
 
 	"github.com/elastic/beats/v7/libbeat/logp"
 )