From 6f901225999882307b613be6a32109694a4af3c4 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 16 Jan 2025 09:43:29 +0100 Subject: [PATCH] conflict --- ignite/services/scaffolder/chain_registry.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ignite/services/scaffolder/chain_registry.go b/ignite/services/scaffolder/chain_registry.go index 5021b6d379..1339e2c616 100644 --- a/ignite/services/scaffolder/chain_registry.go +++ b/ignite/services/scaffolder/chain_registry.go @@ -9,18 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" -<<<<<<< HEAD chainconfig "github.com/ignite/cli/v28/ignite/config/chain" + "github.com/ignite/cli/v28/ignite/pkg/chainregistry" "github.com/ignite/cli/v28/ignite/pkg/errors" "github.com/ignite/cli/v28/ignite/pkg/xgit" "github.com/ignite/cli/v28/ignite/services/chain" -======= - chainconfig "github.com/ignite/cli/v29/ignite/config/chain" - "github.com/ignite/cli/v29/ignite/pkg/chainregistry" - "github.com/ignite/cli/v29/ignite/pkg/errors" - "github.com/ignite/cli/v29/ignite/pkg/xgit" - "github.com/ignite/cli/v29/ignite/services/chain" ->>>>>>> ec26e2ee (feat: expose chain-registry structs (#4472)) ) const (