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.

1 files changed, 1 insertions, 1 deletions

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