Fix merge conflicts

elastic · Aug 31, 2023 · 838a2e8 · 838a2e8
1 parent 2e5c384
commit 838a2e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/systemtest/go.mod b/systemtest/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6
 	github.com/elastic/apm-tools v0.0.0-20230712130005-87efbbd3dafd
 	github.com/elastic/go-elasticsearch/v8 v8.8.1
+	github.com/elastic/go-lumber v0.1.1
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jaegertracing/jaeger v1.47.0
@@ -34,7 +35,6 @@ require (
 	golang.org/x/sys v0.10.0
 	golang.org/x/time v0.3.0
 	google.golang.org/grpc v1.56.1
-	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -58,11 +58,7 @@ require (
 	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect
-<<<<<<< HEAD
 	github.com/elastic/go-licenser v0.4.0 // indirect
-=======
-	github.com/elastic/go-lumber v0.1.1 // indirect
->>>>>>> 3771a5fe (Handle queue.* config for libbeat outputs (#11534))
 	github.com/elastic/go-sysinfo v1.7.1 // indirect
 	github.com/elastic/go-windows v1.0.1 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
@@ -105,6 +101,7 @@ require (
 	google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	howett.net/plist v1.0.0 // indirect
 )
 

diff --git a/systemtest/go.sum b/systemtest/go.sum
@@ -85,21 +85,16 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6 h1:xT0z9yPjU0Csoq9B3BZls8CCtEeU3HMFhuSK8vu9YAo=
 github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6/go.mod h1:zK9WN3ehaqmWNgGCDtLpJ3ensSTsZ+N+T4TD11fQPx0=
-github.com/elastic/apm-tools v0.0.0-20230710072437-2700b8f3f6d4 h1:R1geTjfQUMlo75M9dOQJk/1b8WK66bbXm2X1hSS3GfY=
-github.com/elastic/apm-tools v0.0.0-20230710072437-2700b8f3f6d4/go.mod h1:cA38VtF9v5JAzmIKAgL8PHMSsrWtaWrI5OSjvCG+DDM=
 github.com/elastic/apm-tools v0.0.0-20230712130005-87efbbd3dafd h1:5elmFJcigfMwDGLVsb0jHCyYZKOVVHDsblOrTMHrqLo=
 github.com/elastic/apm-tools v0.0.0-20230712130005-87efbbd3dafd/go.mod h1:cA38VtF9v5JAzmIKAgL8PHMSsrWtaWrI5OSjvCG+DDM=
 github.com/elastic/elastic-transport-go/v8 v8.3.0 h1:DJGxovyQLXGr62e9nDMPSxRyWION0Bh6d9eCFBriiHo=
 github.com/elastic/elastic-transport-go/v8 v8.3.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI=
 github.com/elastic/go-elasticsearch/v8 v8.8.1 h1:/OiP5Yex40q5eWpzFVQIS8jRE7SaEZrFkG9JbE6TXtY=
 github.com/elastic/go-elasticsearch/v8 v8.8.1/go.mod h1:GU1BJHO7WeamP7UhuElYwzzHtvf9SDmeVpSSy9+o6Qg=
-<<<<<<< HEAD
 github.com/elastic/go-licenser v0.4.0 h1:jLq6A5SilDS/Iz1ABRkO6BHy91B9jBora8FwGRsDqUI=
 github.com/elastic/go-licenser v0.4.0/go.mod h1:V56wHMpmdURfibNBggaSBfqgPxyT1Tldns1i87iTEvU=
-=======
 github.com/elastic/go-lumber v0.1.1 h1:aae5rSBnwBvdB0aShJ7AbOYPyvP1/wS/JIOC1A4D1DM=
 github.com/elastic/go-lumber v0.1.1/go.mod h1:DMVoFv7YM71enE9X5vWJWWv7wvQNtzXh7bPeKukDccY=
->>>>>>> 3771a5fe (Handle queue.* config for libbeat outputs (#11534))
 github.com/elastic/go-sysinfo v1.7.1 h1:Wx4DSARcKLllpKT2TnFVdSUJOsybqMYCNQZq1/wO+s0=
 github.com/elastic/go-sysinfo v1.7.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0=
 github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=