mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-10-03 22:07:29 +03:00
Make changelog easier to merge
This commit is contained in:
parent
c803c6c95b
commit
0cf5571006
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user