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

Mariatta · web-flow · commit d7564e538c25 · 2017-04-04T14:49:31.000+02:00
(cherry picked from commit 060d2d7)
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

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-Misc/NEWS merge=union`
`2`		`-`
`3`	`1`	`*.pck binary`
`4`	`2`	`Lib/test/cjkencodings/* binary`
`5`	`3`	`Lib/test/decimaltestdata/*.decTest binary`