fix: conflict error

Signed-off-by: zemyblue <[email protected]>
Finschia · Jun 25, 2024 · 085ca67 · 085ca67
1 parent 4c7c566
commit 085ca67
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 523 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,13 +22,8 @@ jobs:
             go.sum
       - uses: actions/setup-go@v5
         with:
-<<<<<<< HEAD
-          go-version: '1.20'
-      - uses: golangci/golangci-lint-action@v4
-=======
           go-version: '1.22'
       - uses: golangci/golangci-lint-action@v6
->>>>>>> a628fb2 (feat: Apply finschia-sdk 0.49.1 (#395))
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.59

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -160,11 +160,7 @@ jobs:
             sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
           done
         if: env.GIT_DIFF
-<<<<<<< HEAD
-      - uses: codecov/[email protected]
-=======
       - uses: codecov/codecov-action@v4
->>>>>>> a628fb2 (feat: Apply finschia-sdk 0.49.1 (#395))
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Build, CI
 * (build) [\#390](https://github.com/Finschia/finschia/pull/390) Modify the way the binary version is set when compiling (backport #388)
+* (build) [\#398](https://github.com/Finschia/finschia/pull/398) Apply Go 1.22, finschia-sdk 0.49.1 and update outdated dependencies (backport #395)
 
 ### Docs
 
@@ -67,17 +68,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Build, CI
 * (build) [\#340](https://github.com/Finschia/finschia/pull/340) Set Finschia/ostracon version
-<<<<<<< HEAD
 * (ci) [\#363](https://github.com/Finschia/finschia/pull/363) Replace deprecated linters with new ones (backport #361)
 * (ci) [\#364](https://github.com/Finschia/finschia/pull/364) Add RELEASE_NOTE.md to .gitignore (backport #362)
 * (swagger) [\#372](https://github.com/Finschia/finschia/pull/372) Add fswap and fbridge swagger settings in swagger config (backport #371)
-=======
-* (ci) [\#361](https://github.com/Finschia/finschia/pull/361) Replace deprecated linters with new ones
-* (ci) [\#362](https://github.com/Finschia/finschia/pull/362) Add RELEASE_NOTE.md to .gitignore
-* (swagger) [\#371](https://github.com/Finschia/finschia/pull/371) Add fswap and fbridge swagger settings in swagger config
-* (build) [\#388](https://github.com/Finschia/finschia/pull/388) Modify the way the binary version is set when compiling
-* (build) [\#395](https://github.com/Finschia/finschia/pull/395) Apply Go 1.22, finschia-sdk 0.49.1 and update outdated dependencies
->>>>>>> a628fb2 (feat: Apply finschia-sdk 0.49.1 (#395))
 
 
 ## [v3.0.0] - 2024-03-04

diff --git a/go.mod b/go.mod
@@ -9,18 +9,13 @@ require (
 	github.com/Finschia/wasmvm v1.1.1-0.12.0
 	github.com/cosmos/ibc-go/v4 v4.3.1
 	github.com/golang/mock v1.6.0
-	github.com/golang/protobuf v1.5.3
+	github.com/golang/protobuf v1.5.4
 	github.com/gorilla/mux v1.8.1
 	github.com/prometheus/client_golang v1.18.0
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.6.0
-<<<<<<< HEAD
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/viper v1.17.0
-=======
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
->>>>>>> a628fb2 (feat: Apply finschia-sdk 0.49.1 (#395))
 	github.com/stretchr/testify v1.9.0
 	github.com/tendermint/tendermint v0.34.24
 	github.com/tendermint/tm-db v0.6.7
@@ -52,13 +47,8 @@ require (
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
-<<<<<<< HEAD
-	github.com/felixge/httpsnoop v1.0.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-=======
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
->>>>>>> a628fb2 (feat: Apply finschia-sdk 0.49.1 (#395))
 	github.com/go-kit/kit v0.13.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -109,11 +99,11 @@ require (
 	github.com/regen-network/cosmos-proto v0.3.1 // indirect
 	github.com/rs/cors v1.10.1 // indirect
 	github.com/rs/zerolog v1.31.0 // indirect
-	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
@@ -131,19 +121,11 @@ require (
 	golang.org/x/sys v0.21.0 // indirect
 	golang.org/x/term v0.21.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
-<<<<<<< HEAD
-	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-=======
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
 	google.golang.org/grpc v1.64.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
->>>>>>> a628fb2 (feat: Apply finschia-sdk 0.49.1 (#395))
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect