fix

builtbystack · Nov 9, 2023 · 1f3ee3a · 1f3ee3a
1 parent 7464737
commit 1f3ee3a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/20231109/Dockerfile b/20231109/Dockerfile
@@ -30,11 +30,7 @@ RUN set -eux && \
     go install mvdan.cc/gofumpt@latest && \
     go install github.com/daixiang0/gci@latest && \
     go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2 && \
-<<<<<<<< HEAD:20231109/Dockerfile
     go install github.com/Yamashou/gqlgenc@v0.16.0 && \
-========
-    go install github.com/Yamashou/gqlgenc@v0.15.1 && \
->>>>>>>> af2ecd9dba0c6d21e183482a8597a763ddf81971:20231018/Dockerfile
     go install github.com/gqlgo/nodecheck/cmd/nodecheck@v1.0.1 && \
     go install github.com/gqlgo/deprecatedquery/cmd/deprecatedquery@v0.0.3 && \
     go install github.com/gqlgo/optionalschema/cmd/optionalschema@v0.0.2 && \