From d1eafb12776d6487ecd48d3991838032a81181d6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 31 May 2014 21:08:50 -0400 Subject: correct order (didn't really cause any breakage) --- src/Propellor/Types/Attr.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3