fix merge conflict

elastic · Jul 28, 2021 · b20b5b8 · b20b5b8
1 parent b24406c
commit b20b5b8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,11 +17,7 @@ To get started with APM please see our [Getting Started Guide](https://www.elast
 
 ### Requirements
 
-<<<<<<< HEAD
-* [Golang](https://golang.org/dl/) 1.16.5
-=======
 * [Golang](https://golang.org/dl/) 1.16.x
->>>>>>> bcd5bb6a (chore: update-beats goal to bump the go version (#5778))
 
 ### Install