From 3d32b8d15859e51fb3fe69fc918cafdb51b470b1 Mon Sep 17 00:00:00 2001 From: Lockwarr Date: Thu, 2 Jan 2025 09:24:32 +0200 Subject: [PATCH] wip: rebase with main --- go.mod | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index b87f451e..052b1eb9 100644 --- a/go.mod +++ b/go.mod @@ -30,13 +30,13 @@ require ( cosmossdk.io/math v1.4.0 cosmossdk.io/store v1.1.1 cosmossdk.io/tools/confix v0.1.2 + cosmossdk.io/x/circuit v0.1.1 cosmossdk.io/x/evidence v0.1.1 cosmossdk.io/x/feegrant v0.1.1 + cosmossdk.io/x/nft v0.1.1 cosmossdk.io/x/tx v0.13.4 cosmossdk.io/x/upgrade v0.1.4 github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2 - cosmossdk.io/x/circuit v0.1.1 - cosmossdk.io/x/nft v0.1.1 github.com/cosmos/cosmos-db v1.0.2 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/ibc-go/modules/capability v1.0.1 @@ -195,7 +195,6 @@ require ( go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect -<<<<<<< HEAD golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect golang.org/x/net v0.30.0 // indirect @@ -208,22 +207,6 @@ require ( google.golang.org/api v0.186.0 // indirect google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect -======= - go.uber.org/ratelimit v0.2.0 // indirect - go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.25.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/oauth2 v0.20.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/term v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect - golang.org/x/time v0.5.0 // indirect - google.golang.org/api v0.180.0 // indirect - google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect ->>>>>>> 302bb91 (chore: update go.mod) gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.10 // indirect