From 3c285d772a42a0bc4fef3a7255d26dc3e8488032 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Oct 2015 17:59:54 -0400 Subject: propellor spin --- src/Propellor/Types.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Types.hs') diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index 5f0e0561..06f0935d 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -262,10 +262,10 @@ instance Combines (Property NoInfo) (Property NoInfo) where SProperty d1 (f a1 a2) (y : cs1) instance Combines RevertableProperty RevertableProperty where - combineWith sf tf (RevertableProperty setup1 teardown1) (RevertableProperty setup2 teardown2) = + combineWith sf tf (RevertableProperty s1 t1) (RevertableProperty s2 t2) = RevertableProperty - (combineWith sf tf setup1 setup2) - (combineWith tf sf teardown1 teardown2) + (combineWith sf tf s1 s2) + (combineWith tf sf t1 t2) instance Combines RevertableProperty (Property HasInfo) where combineWith sf tf (RevertableProperty x _) y = combineWith sf tf x y -- cgit v1.2.3