Solved Conflict

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"]
+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