From 847a79f526eea0e6711cf1a0a16f3a48691949cf Mon Sep 17 00:00:00 2001
From: jobevers <jobevers@users.noreply.github.com>
Date: Mon, 20 Feb 2017 21:37:50 -0600
Subject: [PATCH] use union merge on CHANGELOG.md

http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..ef9566b29
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/CHANGELOG.md merge=union
\ No newline at end of file