From 2c700af5a761f83f303cc7295b660ac31f7d4ed1 Mon Sep 17 00:00:00 2001
From: INADA Naoki <methane@users.noreply.github.com>
Date: Tue, 21 Feb 2017 18:39:41 +0900
Subject: .gitattribute -> .gitattributes (GH-213)

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..253cc6dee4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Misc/NEWS   merge=union
-- 
cgit v1.2.1