Update version.asciidoc

fix merge conflict
elastic · Jul 15, 2021 · 4aaf0b4 · 4aaf0b4
1 parent d4ca71b
commit 4aaf0b4
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.14.0
 :doc-branch: 7.x
-:go-version: 1.16.5
-=======
-:stack-version: 8.0.0
-:doc-branch: master
 :go-version: 1.16.6
->>>>>>> 240ee56f3 ([automation] Update go release version 1.16.6 (#26860))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12