Skip to content

Commit 31e2513

Browse files
gjermundgarabamergify[bot]
authored andcommitted
chore: move blsverifier to 08-wasm (#8091)
(cherry picked from commit 05e846d) # Conflicts: # e2e/go.mod # modules/light-clients/08-wasm/blsverifier/go.mod # modules/light-clients/08-wasm/go.mod # modules/light-clients/08-wasm/testing/simapp/app.go
1 parent 7433012 commit 31e2513

File tree

4 files changed

+20
-656
lines changed

4 files changed

+20
-656
lines changed

e2e/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff 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.
239239
replace github.com/cosmos/ibc-go/v10 => ../
240240

241+
<<<<<<< HEAD
241242
replace (
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

246250
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

0 commit comments

Comments
 (0)