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)

---
 .gitattribute  | 1 -
 .gitattributes | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 .gitattribute
 create mode 100644 .gitattributes

diff --git a/.gitattribute b/.gitattribute
deleted file mode 100644
index 253cc6d..0000000
--- a/.gitattribute
+++ /dev/null
@@ -1 +0,0 @@
-Misc/NEWS   merge=union
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..253cc6d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Misc/NEWS   merge=union
-- 
cgit v0.12