diff options
Diffstat (limited to 'Logs/Trust.hs')
| -rw-r--r-- | Logs/Trust.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Logs/Trust.hs b/Logs/Trust.hs index 54cafc9f4..e68efc895 100644 --- a/Logs/Trust.hs +++ b/Logs/Trust.hs @@ -72,7 +72,7 @@ trustMapLoad = do map (\r -> (Types.Remote.uuid r, UnTrusted)) exports logged <- trustMapRaw let configured = M.fromList $ mapMaybe configuredtrust l - let m = M.union exportoverrides $ + let m = M.unionWith max exportoverrides $ M.union overrides $ M.union configured logged Annex.changeState $ \s -> s { Annex.trustmap = Just m } |