fix: conflict files

Tech-Preta · Sep 9, 2024 · 5e046c2 · 5e046c2
2 parents 19e582d + fe7afbd
commit 5e046c2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,11 @@
 # Use the official Golang image to create a build artifact.
 # This is based on Debian and sets the GOPATH to /go.
+<<<<<<< HEAD
 FROM golang:1.23.1 as builder
+=======
+FROM FROM golang:1.23.1 as builder
+
+>>>>>>> main
 
 # Copy local code to the container image.
 WORKDIR /go/src/projeto