From f097e416f2c4b671fed781441f39f4d553c17c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20A=CC=8Ahsberg?= <mathias.ahsberg@gmail.com>
Date: Fri, 13 Mar 2015 22:54:10 +0100
Subject: [PATCH] Rename CHANGELOG to conform to naming standard.

Adds union merge strategy for CHANGELOG
---
 .gitattributes           | 1 +
 CHANGES.txt => CHANGELOG | 0
 2 files changed, 1 insertion(+)
 create mode 100644 .gitattributes
 rename CHANGES.txt => CHANGELOG (100%)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..89e130e0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG merge=union
diff --git a/CHANGES.txt b/CHANGELOG
similarity index 100%
rename from CHANGES.txt
rename to CHANGELOG