Fix conflicts.

elastic · Aug 4, 2023 · f82bef3 · f82bef3
1 parent 9496bf0
commit f82bef3
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 55 deletions.
diff --git a/.go-version b/.go-version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.19.10
-=======
-1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+1.19.12
diff --git a/.golangci.yml b/.golangci.yml
@@ -108,11 +108,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.10"
-=======
-    go: "1.20.7"
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+    go: "1.19.12"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -130,31 +126,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.10"
-=======
-    go: "1.20.7"
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+    go: "1.19.12"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.10"
-=======
-    go: "1.20.7"
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+    go: "1.19.12"
     # Disabled:
     # ST1005: error strings should not be capitalized
     checks: ["all", "-ST1005"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-<<<<<<< HEAD
-    go: "1.19.10"
-=======
-    go: "1.20.7"
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+    go: "1.19.12"
 
   gosec:
     excludes:

diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.10
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+FROM golang:1.19.12
 
 RUN \
     apt-get update \

diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.10
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+FROM golang:1.19.12
 
 RUN \
     apt-get update \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,10 +1,6 @@
 :stack-version: 8.9.0
 :doc-branch: main
-<<<<<<< HEAD
-:go-version: 1.19.10
-=======
-:go-version: 1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+:go-version: 1.19.12
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.10
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+FROM golang:1.19.12
 
 RUN \
     apt update \

diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.10
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+FROM golang:1.19.12
 
 RUN \
     apt-get update \

diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM golang:1.19.10
-=======
-FROM golang:1.20.7
->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241))
+FROM golang:1.19.12
 
 RUN \
     apt-get update \