Bump cabal project

IntersectMBO · Apr 17, 2024 · 6403da5 · 6403da5
1 parent f8d0989
commit 6403da5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cabal.project b/cabal.project
@@ -37,3 +37,9 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+source-repository-package
+    type: git
+    location: https://github.com/IntersectMBO/cardano-api.git
+    tag: 3bbdf8ae962d91602a4d8b0b416e90a0e8024943
+    subdir: cardano-api
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Key.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Key.hs
@@ -221,8 +221,12 @@ readExtendedVerificationKeyFile evkfile = do
       k@AVrfVerificationKey{}           -> goFail k
       k@AStakeVerificationKey{}         -> goFail k
       k@ADRepVerificationKey{}          -> goFail k
+<<<<<<< HEAD
       k@ACommitteeColdVerificationKey{} -> goFail k
       k@ACommitteeHotVerificationKey{}  -> goFail k
+=======
+      _ -> error "readExtendedVerificationKeyFile: TODO"
+>>>>>>> d6c43a76d (Bump cabal project)
   where
     goFail k = left $ KeyCmdExpectedExtendedVerificationKey k