File tree Expand file tree Collapse file tree 4 files changed +20
-656
lines changed
modules/light-clients/08-wasm Expand file tree Collapse file tree 4 files changed +20
-656
lines changed Original file line number Diff line number Diff line change @@ -238,9 +238,13 @@ require (
238238// uncomment to use the local version of ibc-go, you will need to run `go mod tidy` in e2e directory.
239239replace github.com/cosmos/ibc-go/v10 => ../
240240
241+ <<<<<<< HEAD
241242replace (
242243 github.com/cosmos/ibc-go/modules/light-clients/08-wasm => ../modules/light-clients/08-wasm
243244 github.com/cosmos/ibc-go/modules/light-clients/08-wasm/blsverifier => ../modules/light-clients/08-wasm/blsverifier
244245)
246+ =======
247+ replace github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 => ../modules/light-clients/08-wasm
248+ >>>>>>> 05e846da (chore: move blsverifier to 08-wasm (#8091))
245249
246250replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
You can’t perform that action at this time.
0 commit comments