summaryrefslogtreecommitdiff
path: root/src/Propellor/Message.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-08 14:50:21 -0400
committerJoey Hess2015-11-08 14:50:21 -0400
commitd7e140aeae8a8ea47976ca1f3e29c4d0b00eacee (patch)
tree31aa4bbf775879dddb307f9d1c99ac84287ca909 /src/Propellor/Message.hs
parentf85b7d1bdc9019fd63c5037094f514a7c7ace8d2 (diff)
parentd50aa85052b1f35021072ea95bc51b5c46c797b0 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Message.hs')
-rw-r--r--src/Propellor/Message.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs
index 7df5104a..e964c664 100644
--- a/src/Propellor/Message.hs
+++ b/src/Propellor/Message.hs
@@ -25,9 +25,9 @@ import Control.Monad.IO.Class (liftIO, MonadIO)
import Control.Applicative
import System.IO.Unsafe (unsafePerformIO)
import Control.Concurrent
+import System.Console.Concurrent
import Propellor.Types
-import Utility.ConcurrentOutput
import Utility.PartialPrelude
import Utility.Monad
import Utility.Exception