summaryrefslogtreecommitdiff
path: root/config-simple.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-07 12:04:58 -0400
committerJoey Hess2014-12-07 12:04:58 -0400
commit322ae878bbaef94736fdc4cae60b6c3b8c17a54d (patch)
tree4113593f21d964ad8f821ebbd408a528011f1398 /config-simple.hs
parentb7da90a91516c0d496c44459ed03009e58f39233 (diff)
parentdd40a05ced3b7c50a3a7751c66ad5a253056459e (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'config-simple.hs')
-rw-r--r--config-simple.hs1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-simple.hs b/config-simple.hs
index c03149ed..95c2fe18 100644
--- a/config-simple.hs
+++ b/config-simple.hs
@@ -12,7 +12,6 @@ import qualified Propellor.Property.Cron as Cron
--import qualified Propellor.Property.Sudo as Sudo
import qualified Propellor.Property.User as User
--import qualified Propellor.Property.Hostname as Hostname
---import qualified Propellor.Property.Reboot as Reboot
--import qualified Propellor.Property.Tor as Tor
import qualified Propellor.Property.Docker as Docker