From 85bbb58cf672a3913be17b2cd774d15b4e6af7cd Mon Sep 17 00:00:00 2001
From: Dominik Schulz <dominik.schulz@gauner.org>
Date: Sun, 17 Jul 2022 15:24:40 +0200
Subject: [PATCH] Mark CHANGELOG.md as merge union

RELEASE_NOTES=n/a

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

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