resolve merge conflict and reduce required go version

CosmWasm · Feb 19, 2025 · 19d75a5 · 19d75a5
1 parent 20aaea0
commit 19d75a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml
@@ -20,11 +20,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-<<<<<<< HEAD
-
-
-=======
->>>>>>> faddat/errcheck
           go-version: "1.23.4"
           cache: false
       - name: golangci-lint

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/CosmWasm/wasmvm/v2
 
-go 1.23
+go 1.21
 
 require (
 	github.com/google/btree v1.0.0