From d34dcc66d705dacaf7f7db16b5302808217b0c68 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 29 Jun 2016 17:26:24 -0700
Subject: Add gitattributes file for the changelog

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 212566614..7e800609e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-* text=auto
\ No newline at end of file
+CHANGELOG merge=union
\ No newline at end of file
-- 
cgit v1.2.3