mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 13:51:30 +11:00
Set CHANGELOG.md merge style to union (#919)
This commit is contained in:
parent
91f05e940f
commit
2e0bbc091f
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -20,3 +20,5 @@
|
|||
*.PDF diff=astextplain
|
||||
*.rtf diff=astextplain
|
||||
*.RTF diff=astextplain
|
||||
|
||||
/CHANGELOG.md merge=union
|
||||
|
|
Loading…
Reference in a new issue