Merge branch 'joeyconfig'

2 files changed, 2 insertions, 2 deletions

diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 0c00e8f4..8d1a2388 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -27,11 +27,11 @@ import qualified Propellor.Property.Systemd.Core as Systemd
 import qualified Propellor.Property.File as File
 import qualified Propellor.Shim as Shim
 import Propellor.Property.Mount
-import Utility.ConcurrentOutput
 
 import qualified Data.Map as M
 import Data.List.Utils
 import System.Posix.Directory
+import System.Console.Concurrent
 
 -- | Specification of a chroot. Normally you'll use `debootstrapped` or
 -- `bootstrapped` to construct a Chroot value.
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index f2dbaaf5..0cc8212b 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -56,7 +56,6 @@ import qualified Propellor.Property.Cmd as Cmd
 import qualified Propellor.Shim as Shim
 import Utility.Path
 import Utility.ThreadScheduler
-import Utility.ConcurrentOutput
 
 import Control.Concurrent.Async hiding (link)
 import System.Posix.Directory
@@ -65,6 +64,7 @@ import Prelude hiding (init)
 import Data.List hiding (init)
 import Data.List.Utils
 import qualified Data.Map as M
+import System.Console.Concurrent
 
 installed :: Property NoInfo
 installed = Apt.installed ["docker.io"]