Make changelog easier to merge

This commit is contained in:
Maurício Szabo 2023-05-16 10:51:48 -03:00
parent c803c6c95b
commit 0cf5571006

2
.gitattributes vendored
View File

@ -1,3 +1,5 @@
CHANGELOG.* merge=union
# Specs depend on character counts, if we don't specify the line endings the
# fixtures will vary depending on platform
spec/fixtures/**/*.js text eol=lf