Fix dockerfile

2020-02-20 13:54:50 +00:00 · 2020-02-20 13:54:50 +00:00 · 0352f250b8
parent 5caae6f3a0
commit 0352f250b8
1 changed files with 0 additions and 4 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM docker.io/golang:1.13.7-alpine3.11
-=======
-FROM docker.io/golang:1.13.6-alpine
->>>>>>> master

 RUN mkdir /build