From b306758836d64f824ef746fde89d212a41e35f56 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sat, 29 Dec 2018 19:35:42 -0500
Subject: [PATCH] Add merge=union for CONTRIBUTORS.md

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

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