From 70c70791eb81754cc622848df4e9f8f81e7d0c60 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Tue, 22 Oct 2024 07:53:07 -0400 Subject: [PATCH] Rebase changes --- cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs | 2 +- cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs index c8557fa43a..8c3cc9d2c4 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs @@ -15,7 +15,7 @@ where import Cardano.Api import Cardano.Api.Compatible -import Cardano.Api.Ledger hiding (VotingProcedures) +import Cardano.Api.Ledger hiding (TxIn, VotingProcedures) import Cardano.Api.Shelley hiding (VotingProcedures) import Cardano.CLI.Environment diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs index 35f11bb4da..476ed5fb4f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs @@ -20,7 +20,6 @@ import Cardano.CLI.Environment (EnvCli (..)) import qualified Cardano.CLI.EraBased.Commands.StakePool as Cmd import Cardano.CLI.EraBased.Options.Common import Cardano.CLI.Parser -import qualified Cardano.Ledger.SafeHash as L import qualified Data.Foldable as F import Options.Applicative hiding (help, str)