merge conflict in tools

ojo-network · Feb 29, 2024 · 10ad14b · 10ad14b
1 parent d0ff77c
commit 10ad14b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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"
 )