Skip to content

Commit

Permalink
Fix merge conflict issue
Browse files Browse the repository at this point in the history
  • Loading branch information
palas authored and jasagredo committed Jan 28, 2025
1 parent a0d3861 commit 2e916c7
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ hprop_ledger_events_propose_new_constitution = integrationWorkspace "propose-new

-- Create Conway constitution
gov <- H.createDirectoryIfMissing $ work </> "governance"
proposalAnchorFile <- H.note $ gov </> "sample-proposal-anchor"
constitutionFile <- H.note $ gov </> "sample-constitution"
constitutionActionFp <- H.note $ gov </> "constitution.action"

let proposalAnchorDataIpfsHash = "QmexFJuEn5RtnHEqpxDcqrazdHPzAwe7zs2RxHLfMH5gBz"
Expand Down Expand Up @@ -179,7 +177,9 @@ hprop_ledger_events_propose_new_constitution = integrationWorkspace "propose-new
]

let relativeUrlProposal = ["ipfs", proposalAnchorDataIpfsHash]
proposalAnchorUrl = "ipfs://" ++ proposalAnchorDataIpfsHash
relativeUrlConstitution = ["ipfs", constitutionAnchorDataIpfsHash]
constitutionAnchorUrl = "ipfs://" ++ constitutionAnchorDataIpfsHash

txbodyFp <- H.note $ work </> "tx.body"
minDRepDeposit <- getMinDRepDeposit epochStateView ceo
Expand Down

0 comments on commit 2e916c7

Please sign in to comment.