diff options
| author | Mariatta <Mariatta@users.noreply.github.com> | 2017-04-04 09:49:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 09:49:14 (GMT) |
| commit | ce92be1825c5ca1d3e6bff24598f3aa54c000b22 (patch) | |
| tree | 0cf75a06dfae9ba325facba4a45d739bc4ec5c85 | |
| parent | cb1e002c07622e027e80a3843d27a623d1617430 (diff) | |
| download | cpython-ce92be1825c5ca1d3e6bff24598f3aa54c000b22.zip cpython-ce92be1825c5ca1d3e6bff24598f3aa54c000b22.tar.gz cpython-ce92be1825c5ca1d3e6bff24598f3aa54c000b22.tar.bz2 | |
remove merge=union attribute for Misc/NEWS (GH-460) (GH-988)
(cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 55a3f49..82694d8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,3 @@ -Misc/NEWS merge=union - *.pck binary Lib/test/cjkencodings/* binary Lib/test/decimaltestdata/*.decTest binary |