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

(cherry picked from commit 060d2d77)

remove merge=union attribute for Misc/NEWS (GH-460) (GH-989)
(cherry picked from commit 060d2d77)
d7564e53 · Mariatta · GitHub · 23d6eb65 · d7564e53
Commit d7564e53 authored Apr 04, 2017 by Mariatta Committed by GitHub Apr 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

.gitattributes .gitattributes +0 -2

No files found.
--- a/.gitattributes
+++ b/.gitattributes
-Misc/NEWS   merge=union
-
 *.pck binary
 Lib/test/cjkencodings/* binary
 Lib/test/decimaltestdata/*.decTest binary