chore: add merge=union git attribute for changelogs (#1475)
parent
63936b696a
commit
c9e1eff6cc
@ -0,0 +1,4 @@
|
|||||||
|
core/CHANGELOG.md merge=union
|
||||||
|
python/CHANGELOG.md merge=union
|
||||||
|
legacy/firmware/CHANGELOG.md merge=union
|
||||||
|
legacy/bootloader/CHANGELOG.md merge=union
|
Loading…
Reference in new issue