summaryrefslogtreecommitdiff
path: root/src/System
diff options
context:
space:
mode:
authorJoey Hess2015-12-19 16:53:17 -0400
committerJoey Hess2015-12-19 16:53:17 -0400
commit898d404788ee93f66aad03120761afbb7a725a43 (patch)
tree05dbd18adba372ee83764b0a1a39eac2a8cc3862 /src/System
parent6f0fe3614f3c55c4a9e312aa6fa6730316fe5ec7 (diff)
parent714270abfcf6433da29dc80fdcaff740ad2a0169 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/System')
-rw-r--r--src/System/Console/Concurrent/Internal.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/System/Console/Concurrent/Internal.hs b/src/System/Console/Concurrent/Internal.hs
index f538a7de..a4cafb61 100644
--- a/src/System/Console/Concurrent/Internal.hs
+++ b/src/System/Console/Concurrent/Internal.hs
@@ -19,7 +19,6 @@ import System.Directory
import System.Exit
import Control.Monad
import Control.Monad.IO.Class (liftIO, MonadIO)
-import Control.Applicative
import System.IO.Unsafe (unsafePerformIO)
import Control.Concurrent
import Control.Concurrent.STM
@@ -30,6 +29,8 @@ import Data.Monoid
import qualified System.Process as P
import qualified Data.Text as T
import qualified Data.Text.IO as T
+import Control.Applicative
+import Prelude
import Utility.Monad
import Utility.Exception