diff --git a/.gitattributes b/.gitattributes index 2c9770c278..1a5fcdfd81 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,5 @@ *js 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 # Make GitHub syntax-highlight .html files as Django templates *.html linguist-language=django