From bc0458ee540da677a04eeddf9b4e0fe8a8991e93 Mon Sep 17 00:00:00 2001
From: Joe Crayne <joe@jerkface.net>
Date: Mon, 1 Jul 2019 02:37:20 -0400
Subject: Attempted to merge 0bc53f99cfd70f3a18802604d7ef3174d004db4c.

I left lib/Kiki.hs out for later.
---
 lib/PacketTranscoder.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/PacketTranscoder.hs')

diff --git a/lib/PacketTranscoder.hs b/lib/PacketTranscoder.hs
index e276528..6eadfe4 100644
--- a/lib/PacketTranscoder.hs
+++ b/lib/PacketTranscoder.hs
@@ -20,7 +20,7 @@ import qualified Data.Traversable      as Traversable
 import System.IO              ( stderr)
 import System.Posix.IO        ( fdToHandle )
 import Text.Show.Pretty as PP ( ppShow )
-import Types
+import KeyRing.Types
 import ControlMaybe (handleIO_)
 
 -- | Merge two representations of the same key, prefering secret version
-- 
cgit v1.2.3