From d45d3e0b9864bf6bcc36e7fd1f60ec74859aaf27 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Wed, 10 Apr 2019 13:44:55 -0700
Subject: [PATCH] [fenix] Adds a gitattribute file to manage changelog merges

---
 .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