Change merge driver for Changelog.md to union

See bbatsov/rubocop#3594 for context on what this is and how it works
This commit is contained in:
John Backus 2016-10-15 19:32:28 -07:00
parent 0b91b3874f
commit de5fb378ac
No known key found for this signature in database
GPG key ID: 9A91898D0B0B2FBE

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
Changelog.md merge=union