From dbe51dc09ddc1e5cae82226e2cac1dae0ba9116d Mon Sep 17 00:00:00 2001
From: David Lord <davidism@gmail.com>
Date: Sun, 23 Jun 2019 16:25:40 -0700
Subject: [PATCH] remove union merge attr

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

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 6f9ff673..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-CHANGES.rst merge=union