From d7564e538c2573105727a209f51c6db26259317b Mon Sep 17 00:00:00 2001
From: Mariatta <Mariatta@users.noreply.github.com>
Date: Tue, 4 Apr 2017 14:49:31 +0200
Subject: remove merge=union attribute for Misc/NEWS (GH-460) (GH-989)

(cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)
---
 .gitattributes | 2 --
 1 file changed, 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
-- 
cgit v0.12