diff options
| author | Joe Crayne <joe@jerkface.net> | 2019-07-01 02:37:20 -0400 |
|---|---|---|
| committer | Joe Crayne <joe@jerkface.net> | 2019-07-01 02:37:20 -0400 |
| commit | bc0458ee540da677a04eeddf9b4e0fe8a8991e93 (patch) | |
| tree | 9b3f7ddce51a9ddbf2be725c78e79523fedee68e /lib/PacketTranscoder.hs | |
| parent | 7c2ee942309df7a484f3ab50b1b090ca5e606c03 (diff) | |
Attempted to merge 0bc53f99cfd70f3a18802604d7ef3174d004db4c.
I left lib/Kiki.hs out for later.
Diffstat (limited to 'lib/PacketTranscoder.hs')
| -rw-r--r-- | lib/PacketTranscoder.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 20 | import System.IO ( stderr) | 20 | import System.IO ( stderr) |
| 21 | import System.Posix.IO ( fdToHandle ) | 21 | import System.Posix.IO ( fdToHandle ) |
| 22 | import Text.Show.Pretty as PP ( ppShow ) | 22 | import Text.Show.Pretty as PP ( ppShow ) |
| 23 | import Types | 23 | import KeyRing.Types |
| 24 | import ControlMaybe (handleIO_) | 24 | import ControlMaybe (handleIO_) |
| 25 | 25 | ||
| 26 | -- | Merge two representations of the same key, prefering secret version | 26 | -- | Merge two representations of the same key, prefering secret version |