summaryrefslogtreecommitdiff
path: root/src/Propellor/Types
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 21:08:50 -0400
committerJoey Hess2014-05-31 21:08:50 -0400
commitd1eafb12776d6487ecd48d3991838032a81181d6 (patch)
treeb5b72c1495ef49b4e0c7a2d2b9aa436b2f02dfae /src/Propellor/Types
parent74c4545a690e8401f5af7fde020319a2a6b6b06c (diff)
correct order (didn't really cause any breakage)
Diffstat (limited to 'src/Propellor/Types')
-rw-r--r--src/Propellor/Types/Attr.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Types/Attr.hs b/src/Propellor/Types/Attr.hs
index 4c891a46..17a02bd2 100644
--- a/src/Propellor/Types/Attr.hs
+++ b/src/Propellor/Types/Attr.hs
@@ -39,7 +39,7 @@ instance Monoid Attr where
Just v -> Just v
Nothing -> _sshPubKey old
, _dns = _dns new <> _dns old
- , _namedconf = _namedconf new <> _namedconf old
+ , _namedconf = _namedconf old <> _namedconf new
, _dockerImage = case _dockerImage new of
Just v -> Just v
Nothing -> _dockerImage old