From d075dbdc11d9eb027e32b6bb220810dbca57e266 Mon Sep 17 00:00:00 2001
From: Luke Morris <lukevmorris@gmail.com>
Date: Tue, 4 Apr 2017 15:13:01 -0700
Subject: [PATCH] Resolve conflicts by taking both changes

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

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