From 7c2ee942309df7a484f3ab50b1b090ca5e606c03 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Mon, 24 Jun 2019 21:18:22 -0400 Subject: move functions around between files. nothing should be different merge-note: I'm having trouble with the merge, so I'm leaving a lot of functions duplicated in lib/Keyring.hs that were originally moved-out to lib/KeyRing/BuildKeyDB.hs in this commit. I'll clean-up later. Hopefully. --- kiki.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kiki.hs') diff --git a/kiki.hs b/kiki.hs index e8b6753..e5544e5 100644 --- a/kiki.hs +++ b/kiki.hs @@ -62,7 +62,7 @@ import Data.OpenPGP.Util (verify,fingerprint,generateKey, GenerateKeyParams(..)) import ScanningParser import PEM import DotLock -import KeyRing +import KeyRing hiding (pemFromPacket) import Base58 import qualified CryptoCoins -- import Chroot -- cgit v1.2.3