arno
/
trezor-firmware
mirror of https://github.com/trezor/trezor-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: add merge=union git attribute for changelogs (#1475)

Browse Source
pull/1488/head
Pavol Rusnak 3 years ago committed by GitHub
parent 63936b696a
commit c9e1eff6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File

4
.gitattributes vendored
Unescape View File

@ -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
Write Preview
Loading…
Cancel
Save