Added git attribute merge=union for release notes
This commit is contained in:
parent
2913d6b77d
commit
3222fc7943
|
@ -3,3 +3,4 @@
|
|||
*css text eol=lf
|
||||
tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
|
||||
tests/staticfiles_tests/project/documents/test/*txt text eol=lf
|
||||
docs/releases/*.txt merge=union
|
||||
|
|
Loading…
Reference in New Issue