cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correct order (didn't really cause any breakage)

This commit is contained in:
Joey Hess 2014-05-31 21:08:50 -04:00
parent 74c4545a69
commit d1eafb1277
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Propellor/Types/Attr.hs
View File

@ -39,7 +39,7 @@ instance Monoid Attr where
Just v -> Just v Just v -> Just v
Nothing -> _sshPubKey old Nothing -> _sshPubKey old
, _dns = _dns new <> _dns old , _dns = _dns new <> _dns old
, _namedconf = _namedconf new <> _namedconf old , _namedconf = _namedconf old <> _namedconf new
, _dockerImage = case _dockerImage new of , _dockerImage = case _dockerImage new of
Just v -> Just v Just v -> Just v
Nothing -> _dockerImage old Nothing -> _dockerImage old