From a32ae24264e15a5b2c990e07e882dcf00e695b42 Mon Sep 17 00:00:00 2001
From: Luke Morris <lukevmorris@gmail.com>
Date: Fri, 7 Apr 2017 17:26:01 -0700
Subject: [PATCH] Temp commit

---
 .gitattributes | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .gitattributes

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