summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 01:39:55 -0400
committerJoey Hess2014-04-04 01:39:55 -0400
commit5c730c6f38ddc7d1b35b206f10c3146589af9d63 (patch)
treef7b3d528e41521a5ae683de8c38fd1d83d956835
parent336e3ccf84c50ecf41fe0212b7abc5d93947da5e (diff)
parentfb04055ddeafc16d63cc332360d437e184421cd4 (diff)
Merge branch 'joeyconfig'
-rw-r--r--config-joey.hs2
-rw-r--r--propellor.cabal2
2 files changed, 0 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 78af292d..cf739d82 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -16,8 +16,6 @@ import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.SiteSpecific.GitHome as GitHome
import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites
--- Only imported to make sure it continues to build.
-import qualified Propellor.Config.Simple ()
import Data.List
main :: IO ()
diff --git a/propellor.cabal b/propellor.cabal
index 1382a43e..e67c41cb 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -64,8 +64,6 @@ Library
Exposed-Modules:
Propellor
- Propellor.Config.Simple
- Propellor.Config.Joey
Propellor.Property
Propellor.Property.Apt
Propellor.Property.Cmd