From 1b083d63ab44d950204fe1166d4d1608f6328c90 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 22 Apr 2016 11:20:25 -0600
Subject: [PATCH] add gitattributes file

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..80edb3f0c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+CHANGELOG.md merge=union
+