summaryrefslogtreecommitdiff
path: root/src/Propellor/Types/Core.hs
diff options
context:
space:
mode:
authorJoey Hess2018-04-30 09:06:08 -0400
committerJoey Hess2018-04-30 09:06:08 -0400
commitbb32fad83db093c30ee6132c5d982cc25fe89bda (patch)
treec106cf941167fa16f9489ba2f49410dc38d814af /src/Propellor/Types/Core.hs
parent345536941eeec4a4562222408d9f4326ce9b2645 (diff)
parent14fe4c4d6b5a29be94ecfc0572e0f9a9a081e795 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Types/Core.hs')
-rw-r--r--src/Propellor/Types/Core.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Types/Core.hs b/src/Propellor/Types/Core.hs
index cd3e09c5..88c749b3 100644
--- a/src/Propellor/Types/Core.hs
+++ b/src/Propellor/Types/Core.hs
@@ -62,7 +62,7 @@ instance Sem.Semigroup (Propellor Result) where
instance Monoid (Propellor Result) where
mempty = return NoChange
- mappend = (<>)
+ mappend = (Sem.<>)
-- | An action that Propellor runs at the end, after trying to satisfy all
-- properties. It's passed the combined Result of the entire Propellor run.