Fix conflict in libbeat/docs/version.asciidoc

elastic · Dec 18, 2024 · 0824409 · 0824409
1 parent d32dadd
commit 0824409
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.17.0
 :doc-branch: 8.x
-:go-version: 1.22.9
-=======
-:stack-version: 9.0.0
-:doc-branch: main
 :go-version: 1.22.10
->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12