Pārlūkot izejas kodu

Added git attribute merge=union for release notes

Adam Chainz 9 gadi atpakaļ
vecāks
revīzija
3222fc7943
1 mainītis faili ar 1 papildinājumiem un 0 dzēšanām
  1. 1 0
      .gitattributes

+ 1 - 0
.gitattributes

@@ -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