summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2017-03-18 19:40:52 -0400
committerJoey Hess2017-03-18 19:40:52 -0400
commit4ceba4a8c007c9a5c4692c5425114139b47aecdf (patch)
tree023a30df483f39678749ed7b38094a75e7da1f62 /src/Propellor
parent01f6936a600f2bf0bea1e9c82fcb6164e31a3cd3 (diff)
parent8b0e3caa9b32f49ec6bb49e777d5a35e3a7e0561 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Types.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index 690c153a..155662c2 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -44,6 +44,8 @@ module Propellor.Types (
) where
import Data.Monoid
+import Control.Applicative
+import Prelude
import Propellor.Types.Core
import Propellor.Types.Info