diff options
| author | Julian Taylor <juliantaylor108@gmail.com> | 2017-02-13 11:06:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 11:06:11 +0100 |
| commit | ee40ff69127fee94e7e3103445729024e7b3de21 (patch) | |
| tree | e6d2d70eb4f029b6ffb23292502eff9dfb0b52a1 | |
| parent | 6f5b96929928b298dc7038659ca74e2c335e8b75 (diff) | |
| parent | b20508c4d49bd7269bcd42d39372a6b81af415cf (diff) | |
| download | numpy-ee40ff69127fee94e7e3103445729024e7b3de21.tar.gz | |
Merge pull request #8612 from charris/fix-release-doc-merge
MAINT: Decrease merge conflicts in release notes
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 82162cb8d..6e1de1b3d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,9 @@ +# Line endings for Windows scripts * text=auto tools/win32build/nsis_scripts/*.nsi.in eol=crlf # Numerical data files numpy/lib/tests/data/*.npy binary + +# Release notes, reduce number of conflicts. +doc/release/*.rst merge=union |