From 6b40112175e09c2528e9c93505cd5e13e92edd3c Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Wed, 22 Mar 2023 21:13:00 +0100
Subject: [PATCH] use union strategy for CHANGELOG.md

Signed-off-by: Christian Goll <cgoll@suse.de>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

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