Update Dockerfile

elastic · Nov 15, 2023 · e128b03 · e128b03
1 parent ebe9768
commit e128b03
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile
@@ -2,11 +2,7 @@ ARG STAN_VERSION=0.15.1
 FROM nats-streaming:$STAN_VERSION
 
 # build stage
-<<<<<<< HEAD
-FROM golang:1.20.10
-=======
 FROM golang:1.20.11 AS build-env
->>>>>>> f04686c188 ([Automation] Bump Golang version to 1.20.11 (#37123))
 RUN apt-get install git mercurial gcc
 RUN git clone https://github.com/nats-io/stan.go.git /stan-go
 RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .