summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
authorJoey Hess2015-10-21 19:47:15 -0400
committerJoey Hess2015-10-21 19:47:15 -0400
commiteac925f398df39791fe8236f8f8329627761f2e9 (patch)
tree9ce53fbad65c36bb39b5102e6792219b43c34d2a /propellor.cabal
parent2d1671d5ebdd3c7f99d4023ac621137938505962 (diff)
parent85f08ee913a77c16ba4d264581b1240468c4ebb2 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'propellor.cabal')
-rw-r--r--propellor.cabal4
1 files changed, 2 insertions, 2 deletions
diff --git a/propellor.cabal b/propellor.cabal
index 516bdde2..7471fb52 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.10.0
+Version: 2.11.0
Cabal-Version: >= 1.8
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>
@@ -76,7 +76,7 @@ Library
Propellor.Property.Apache
Propellor.Property.Apt
Propellor.Property.Cmd
- Propellor.Property.ControlHeir
+ Propellor.Property.Conductor
Propellor.Property.Hostname
Propellor.Property.Chroot
Propellor.Property.ConfFile