From 4a1ae9798a929d155476f8e5c42a32892dd4deb0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 14 Dec 2022 17:44:16 -0600
Subject: [PATCH] Add .gitattributes, prevent conflicts on CHANGELOG.md

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..4157440bf
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
\ No newline at end of file