Run make check and commit the changes. (#34349)

The format step was skipped in #34346 (cherry picked from commit 870215c) # Conflicts: # x-pack/libbeat/management/managerV2.go
elastic · Jan 23, 2023 · cff9df4 · cff9df4
1 parent 5e4f2c2
commit cff9df4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/x-pack/libbeat/management/managerV2.go b/x-pack/libbeat/management/managerV2.go
@@ -13,12 +13,21 @@ import (
 	"syscall"
 	"time"
 
+<<<<<<< HEAD
+=======
+	"github.com/gofrs/uuid"
+>>>>>>> 870215c6fd (Run make check and commit the changes. (#34349))
 	"github.com/joeshaw/multierror"
 	"go.uber.org/zap/zapcore"
 
 	"github.com/gofrs/uuid"
 	"gopkg.in/yaml.v2"
 
+	"github.com/elastic/elastic-agent-client/v7/pkg/client"
+	"github.com/elastic/elastic-agent-client/v7/pkg/proto"
+	conf "github.com/elastic/elastic-agent-libs/config"
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/libbeat/common/reload"
 	lbmanagement "github.com/elastic/beats/v7/libbeat/management"
 	"github.com/elastic/beats/v7/libbeat/version"