From: Mariatta Date: Tue, 4 Apr 2017 12:49:31 +0000 (+0200) Subject: remove merge=union attribute for Misc/NEWS (GH-460) (GH-989) X-Git-Tag: v2.7.14rc1~223 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7564e538c2573105727a209f51c6db26259317b;p=python remove merge=union attribute for Misc/NEWS (GH-460) (GH-989) (cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba) --- diff --git a/.gitattributes b/.gitattributes index 55a3f49922..82694d81f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,3 @@ -Misc/NEWS merge=union - *.pck binary Lib/test/cjkencodings/* binary Lib/test/decimaltestdata/*.decTest binary