squash: fix rebase markings governance commands

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/EraBased/Governance/GenesisKeyDelegationCertificate/Run.hs

@@ -33,25 +33,14 @@ runGovernanceGenesisKeyDelegationCertificate
   vrfVkOrHashOrFp
   oFp = do
     genesisVkHash <-
-<<<<<<< HEAD
-      modifyError GovernanceCmdKeyReadError $
-        readVerificationKeyOrHashOrTextEnvFile genVkOrHashOrFp
-    genesisDelVkHash <-
-      modifyError GovernanceCmdKeyReadError $
-        readVerificationKeyOrHashOrTextEnvFile genDelVkOrHashOrFp
-    vrfVkHash <-
-      modifyError GovernanceCmdKeyReadError $
-        readVerificationKeyOrHashOrFile vrfVkOrHashOrFp
-=======
       fromExceptTCli $
-        readVerificationKeyOrHashOrTextEnvFile AsGenesisKey genVkOrHashOrFp
+        readVerificationKeyOrHashOrTextEnvFile genVkOrHashOrFp
     genesisDelVkHash <-
       fromExceptTCli $
-        readVerificationKeyOrHashOrTextEnvFile AsGenesisDelegateKey genDelVkOrHashOrFp
+        readVerificationKeyOrHashOrTextEnvFile genDelVkOrHashOrFp
     vrfVkHash <-
       fromExceptTCli $
-        readVerificationKeyOrHashOrFile AsVrfKey vrfVkOrHashOrFp
->>>>>>> 9730c5720 (Convert runGovernanceCmds to use CIO e ())
+        readVerificationKeyOrHashOrFile vrfVkOrHashOrFp
 
     let req = GenesisKeyDelegationRequirements stb genesisVkHash genesisDelVkHash vrfVkHash
         genKeyDelegCert = makeGenesisKeyDelegationCertificate req