summaryrefslogtreecommitdiff
path: root/src/Propellor/Engine.hs
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/Propellor/Engine.hs
parent6f0fe3614f3c55c4a9e312aa6fa6730316fe5ec7 (diff)
parent714270abfcf6433da29dc80fdcaff740ad2a0169 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Engine.hs')
-rw-r--r--src/Propellor/Engine.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index 36a05b28..2e914d67 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -14,12 +14,13 @@ module Propellor.Engine (
import System.Exit
import System.IO
import Data.Monoid
-import Control.Applicative
import "mtl" Control.Monad.RWS.Strict
import System.PosixCompat
import System.Posix.IO
import System.FilePath
import System.Directory
+import Control.Applicative
+import Prelude
import Propellor.Types
import Propellor.Message