summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Firewall.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/Property/Firewall.hs
parent345536941eeec4a4562222408d9f4326ce9b2645 (diff)
parent14fe4c4d6b5a29be94ecfc0572e0f9a9a081e795 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Firewall.hs')
-rw-r--r--src/Propellor/Property/Firewall.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs
index ff7ffebf..7b62558d 100644
--- a/src/Propellor/Property/Firewall.hs
+++ b/src/Propellor/Property/Firewall.hs
@@ -205,4 +205,4 @@ instance Sem.Semigroup Rules where
instance Monoid Rules where
mempty = Everything
- mappend = (<>)
+ mappend = (Sem.<>)