From 0352f250b85721580055f4ba1321c2dda11f0b97 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 20 Feb 2020 13:54:50 +0000
Subject: [PATCH] Fix dockerfile

---
 docker/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 29b27dde..5810825a 100644
--- 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