From 38872f151dfbab855e34492fec23c764ed42fe27 Mon Sep 17 00:00:00 2001
From: Daniel Compton <desk@danielcompton.net>
Date: Mon, 7 Nov 2016 08:41:19 +1300
Subject: [PATCH] Add gitattributes file for CHANGES.md 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 0000000..7ac043d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.md merge=union