From 10ad14b7988a308a7eb84d801163d41629da5335 Mon Sep 17 00:00:00 2001 From: rbajollari Date: Thu, 29 Feb 2024 14:22:02 -0700 Subject: [PATCH] merge conflict in tools --- .github/workflows/tests.yml | 2 +- tools/tools.go | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5350f72a..32ae5eca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,7 +44,7 @@ jobs: if: env.GIT_DIFF run: | make test-unit-cover - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v3 if: env.GIT_DIFF with: file: ./coverage.txt diff --git a/tools/tools.go b/tools/tools.go index c1efe939..f327d033 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -10,11 +10,8 @@ package tools import ( _ "github.com/golangci/golangci-lint/cmd/golangci-lint" _ "github.com/mgechev/revive" -<<<<<<< HEAD -======= _ "golang.org/x/tools/cmd/goimports" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc" _ "google.golang.org/protobuf/cmd/protoc-gen-go" ->>>>>>> 8649e17 (feat: Upgrade tia branch to cosmos sdk v0.50.1 (#382)) _ "mvdan.cc/gofumpt" )