update version.asciidoc

elastic · May 28, 2021 · baa386f · baa386f
1 parent 2ccc5be
commit baa386f
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: 7.11.0
 :doc-branch: 7.x
-:go-version: 1.15.12
-=======
-:stack-version: 8.0.0
-:doc-branch: master
 :go-version: 1.16.4
->>>>>>> 4dc5285ae (Update Go version to 1.16.4 (#25671))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12