Skip to content

Commit c9e1eff

Browse files
prusnakprusnak
authoredFeb 19, 2021
chore: add merge=union git attribute for changelogs (trezor#1475)
1 parent 63936b6 commit c9e1eff

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed
 

‎.gitattributes

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
core/CHANGELOG.md merge=union
2+
python/CHANGELOG.md merge=union
3+
legacy/firmware/CHANGELOG.md merge=union
4+
legacy/bootloader/CHANGELOG.md merge=union

0 commit comments

Comments
 (0)
Please sign in to comment.