Fix merge conflict in libbeat/docs/version.asciidoc

elastic · Jun 13, 2024 · da27104 · da27104
1 parent 63b136b
commit da27104
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 8.14.1
 :doc-branch: 8.14
-:go-version: 1.21.10
-=======
-:stack-version: 8.15.0
-:doc-branch: main
 :go-version: 1.21.11
->>>>>>> b5155a177e ([Automation] Bump Golang version to 1.21.11 (#39851))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12