mirror of
https://github.com/Hopiu/django.git
synced 2026-04-13 11:31:13 +00:00
Added git attribute merge=union for release notes
This commit is contained in:
parent
2913d6b77d
commit
3222fc7943
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -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 a new issue