Added git attribute merge=union for release notes (3222fc79) · Commits · Dom Sekotill / django

.gitattributes

+1 −0

Original line number	Diff line number	Diff line
		@@ -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