Commit 386ba915 authored by Steffen Michels's avatar Steffen Michels

Merge branch 'overwrite-in-tune' into 'master'

Fix overwriting in tune of Editor (Map.union is left-biased)

See merge request !322
parents 9eed4845 84181971
Pipeline #29414 passed with stage
in 4 minutes and 35 seconds
...@@ -38,7 +38,7 @@ instance tune UIAttributes Editor ...@@ -38,7 +38,7 @@ instance tune UIAttributes Editor
where where
tune extra editor=:{Editor|genUI=editorGenUI} = {Editor|editor & genUI = genUI} tune extra editor=:{Editor|genUI=editorGenUI} = {Editor|editor & genUI = genUI}
where where
genUI attr dp mode vst = editorGenUI ('DM'.union attr extra) dp (mapEditMode id mode) vst genUI attr dp mode vst = editorGenUI ('DM'.union extra attr) dp (mapEditMode id mode) vst
instance tune UIAttribute Task instance tune UIAttribute Task
where where
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment