From 49c71f2f0f86b02e6edfb8bc9f6d32006d0b8218 Mon Sep 17 00:00:00 2001
From: Carl Hammann <carl.hammann@tweag.io>
Date: Fri, 27 Oct 2023 15:51:34 +0200
Subject: [PATCH] Delete leftover comments

---
 .../Cardano/CLI/EraBased/Options/Common.hs    | 21 -------------------
 .../EraBased/Options/Governance/Actions.hs    | 11 +---------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
index 3d573c63b7..582dfe4425 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -2543,26 +2543,6 @@ pStakePoolRegistrationParserRequirements envCli =
 pProtocolParametersUpdate :: Parser ProtocolParametersUpdate
 pProtocolParametersUpdate =
   ProtocolParametersUpdate
--- <<<<<<< HEAD
---     <$> optional pProtocolVersion
---     <*> optional pDecentralParam
---     <*> optional pExtraEntropy
---     <*> optional pMaxBlockHeaderSize
---     <*> optional pMaxBodySize
---     <*> optional pMaxTransactionSize
---     <*> optional pMinFeeConstantFactor
---     <*> optional pMinFeePerByteFactor
---     <*> optional pMinUTxOValue
---     <*> optional pKeyRegistDeposit
---     <*> optional pPoolDeposit
---     <*> optional pMinPoolCost
---     <*> optional pEpochBoundRetirement
---     <*> optional pNumberOfPools
---     <*> optional pPoolInfluence
---     <*> optional pMonetaryExpansion
---     <*> optional pTreasuryExpansion
---     <*> pure Nothing
--- =======
     <$> optional (pProtocolVersion $ Just "new")
     <*> optional (pDecentralParam $ Just "new")
     <*> optional (pExtraEntropy $ Just "new")
@@ -2581,7 +2561,6 @@ pProtocolParametersUpdate =
     <*> optional (pMonetaryExpansion $ Just "new")
     <*> optional (pTreasuryExpansion $ Just "new")
     <*> optional (pUTxOCostPerWord $ Just "new")
--- >>>>>>> 38e2dc7a5 (Disambiguate protocol parameter update flags)
     <*> pure mempty
     <*> optional (pExecutionUnitPrices $ Just "new")
     <*> optional (pMaxTxExecutionUnits $ Just "new")
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
index a60fcb231b..11b4fc71e6 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
@@ -272,18 +272,9 @@ pShelleyToAlonzoPParams =
     <$> convertToLedger id (optional $ toLedgerNonce <$> pExtraEntropy (Just "new"))
     <*> convertToLedger toUnitIntervalOrErr (optional $ pDecentralParam $ Just "new")
 
--- <<<<<<< HEAD
--- =======
--- pShelleyToAlonzoPParams :: Parser (ShelleyToAlonzoPParams era)
--- pShelleyToAlonzoPParams =
---   ShelleyToAlonzoPParams
---     <$> convertToLedger (CoinPerWord . toShelleyLovelace) (optional $ pUTxOCostPerWord $ Just "new")
---
---
--- >>>>>>> 38e2dc7a5 (Disambiguate protocol parameter update flags)
 pAlonzoOnwardsPParams :: Parser (AlonzoOnwardsPParams ledgerera)
 pAlonzoOnwardsPParams =
-  AlonzoOnwardsPParams SNothing -- TODO: Conway era cost model
+  AlonzoOnwardsPParams SNothing
     <$> convertToLedger (either (\e -> error $ "pAlonzoOnwardsPParams: " <> show e) id . toAlonzoPrices)
                         (optional $ pExecutionUnitPrices $ Just "new")
     <*> convertToLedger toAlonzoExUnits (optional $ pMaxTxExecutionUnits $ Just "new")