Set CHANGELOG.md merge style to union (#919)

This commit is contained in:
Osspial 2019-06-13 16:11:44 -04:00 committed by GitHub
parent 91f05e940f
commit 2e0bbc091f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

2
.gitattributes vendored
View file

@ -20,3 +20,5 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
/CHANGELOG.md merge=union