Fix conflict in version.asciidoc

elastic · Oct 16, 2023 · c7f44b7 · c7f44b7
1 parent 3ccc71c
commit c7f44b7
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.10.3
 :doc-branch: 8.10
-:go-version: 1.20.8
-=======
-:stack-version: 8.11.0
-:doc-branch: main
 :go-version: 1.20.10
->>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12