summaryrefslogtreecommitdiff
path: root/src/Propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-06-09 12:32:15 -0400
committerJoey Hess2014-06-09 12:32:15 -0400
commit70ab611efdaf8bba6becc42bef14cc47486d42a6 (patch)
treea5e5a10056601d90a1a3fbd05c397bf484540c8a /src/Propellor.hs
parentbfbe9b2c9aaeb4e923dedabd8f5a53a0bd9c3acf (diff)
parenta1341ccb315a98e407a25bf25411759b6f8f58d2 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor.hs')
-rw-r--r--src/Propellor.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor.hs b/src/Propellor.hs
index e6312248..c0ef14f4 100644
--- a/src/Propellor.hs
+++ b/src/Propellor.hs
@@ -33,7 +33,7 @@ module Propellor (
module Propellor.Types
, module Propellor.Property
, module Propellor.Property.Cmd
- , module Propellor.Attr
+ , module Propellor.Info
, module Propellor.PrivData
, module Propellor.Engine
, module Propellor.Exception
@@ -50,7 +50,7 @@ import Propellor.Property.Cmd
import Propellor.PrivData
import Propellor.Message
import Propellor.Exception
-import Propellor.Attr
+import Propellor.Info
import Utility.PartialPrelude as X
import Utility.Process as X