summaryrefslogtreecommitdiff
path: root/src/Propellor/Property.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/Property.hs
parent6f0fe3614f3c55c4a9e312aa6fa6730316fe5ec7 (diff)
parent714270abfcf6433da29dc80fdcaff740ad2a0169 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property.hs')
-rw-r--r--src/Propellor/Property.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index e862fb44..a83bffc4 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -38,12 +38,13 @@ module Propellor.Property (
import System.Directory
import System.FilePath
import Control.Monad
-import Control.Applicative
import Data.Monoid
import Control.Monad.IfElse
import "mtl" Control.Monad.RWS.Strict
import System.Posix.Files
import qualified Data.Hash.MD5 as MD5
+import Control.Applicative
+import Prelude
import Propellor.Types
import Propellor.Types.ResultCheck