Skip to content

Commit

Permalink
Added git attribute merge=union for release notes
Browse files Browse the repository at this point in the history
  • Loading branch information
@timgraham
Adam Chainz authored and timgraham committed Jun 2, 2015
1 parent 2913d6b commit 3222fc7
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3222fc7

Please sign in to comment.