summaryrefslogtreecommitdiff
path: root/src/Propellor/Property.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2015-09-14 20:23:08 -0400
committerJoey Hess <joeyh@joeyh.name>2015-09-14 20:23:08 -0400
commite5c398a0f6dfc65d56c2dcdf2e8bbf031579ef38 (patch)
treec76125aaf059f4acaab6a32c3cfc223e5294c787 /src/Propellor/Property.hs
parent0f9f05ae9e65182daa9bfc98a9932e2e1382e9b5 (diff)
parentfb7b1826870c8a0e01f88da74ff2fd98a0626d5b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property.hs')
-rw-r--r--src/Propellor/Property.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index b90d5b86..e8d70a80 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -67,8 +67,7 @@ onChangeFlagOnFail
-> Property x
-> Property y
-> CombinedType (Property x) (Property y)
-onChangeFlagOnFail flagfile p1 p2 =
- combineWith go p1 p2
+onChangeFlagOnFail flagfile = combineWith go
where
go s1 s2 = do
r1 <- s1