remove merge=union attribute for Misc/NEWS (pythonGH-460)

Github doesn't support it (ref. isaacs/github#487). So it can't ease conflict on Github. Additionally, it can make trouble when cherry-pick. (ref. pythonGH-212)
Mariatta · Apr 4, 2017 · ac8cdab · ac8cdab
1 parent 9c2c42c
commit ac8cdab
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,3 @@
-Misc/NEWS   merge=union
-
 *.pck binary
 Lib/test/cjkencodings/* binary
 Lib/test/decimaltestdata/*.decTest binary