From c0e8b1b8e16bd9858692224c6718e4f13eb135dc Mon Sep 17 00:00:00 2001
From: Alpha <moritz@cliffbreak.de>
Date: Thu, 31 Jan 2019 18:06:19 +0100
Subject: [PATCH] Solved Conflict

---
 Dockerfile | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b85c79..96502db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 
-<<<<<<< HEAD
 FROM golang:latest 	
 RUN mkdir /app 			
 RUN mkdir -p /app
@@ -9,31 +8,4 @@ RUN go build -o main .
 CMD ["/app/main"]	
 ADD . /app	
 RUN go build ./main.go 	
-CMD ["./main"]
-=======
-# Install git.
-# Git is required for fetching the dependencies.
-RUN apk update && apk add --no-cache git
-
-WORKDIR $GOPATH/src/git.cliffbreak.de/Cliffbreak/tsviewer
-COPY . .
-
-# Fetch dependencies.
-
-# Using go get.
-RUN go get -d -v
-
-# Build the binary.
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/main
-
-############################
-# STEP 2 build a small image
-############################
-FROM scratch
-
-# Copy our static executable.
-COPY --from=builder /go/bin/main /go/bin/main
-
-# Run the hello binary.
-ENTRYPOINT ["/go/bin/main"]
->>>>>>> 5012872895a69040a761a5dec89f72e6c87adbd0
+CMD ["./main"]
\ No newline at end of file