Merge conflict

2022-08-13 14:45:40 +01:00
parent 7325d348bc b38c70a425
commit 2c05dc5e76
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as build
+FROM golang:1.19-alpine as build
 WORKDIR /go/src/app
 COPY . /go/src/app
 RUN CGO_ENABLED=0 go build -o /go/bin/app
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,3 @@
 module github.com/luketainton/iPilot

-go 1.17
+go 1.19