From 2e0bbc091f3efa94ededacf383629d5a19f9d77e Mon Sep 17 00:00:00 2001
From: Osspial <osspial@gmail.com>
Date: Thu, 13 Jun 2019 16:11:44 -0400
Subject: [PATCH] Set CHANGELOG.md merge style to union (#919)

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 412eeda7..81f4fe3a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,3 +20,5 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+/CHANGELOG.md merge=union