diff options
| author | Adam Chainz <adam@adamj.eu> | 2015-06-02 16:11:19 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-02 12:04:40 -0400 |
| commit | 3222fc79431c0866aa65b2a83fbbffd2c3034d08 (patch) | |
| tree | c19b2b969421c20b4e1cf3aa4e5bf5d486a0bd5a /.gitattributes | |
| parent | 2913d6b77d8b2082dc79df5503b7dd3ddd05fcc1 (diff) | |
| download | django-3222fc79431c0866aa65b2a83fbbffd2c3034d08.tar.gz | |
Added git attribute merge=union for release notes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cd42cc51ca..4bd6655ffd 100644 --- a/.gitattributes +++ b/.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 |