From 7aa26b4b340b3f04353a6d486ebba5de429ce0f6 Mon Sep 17 00:00:00 2001
From: Martin Teichmann <martin.teichmann@xfel.eu>
Date: Mon, 10 Jan 2022 15:35:26 +0100
Subject: [PATCH] union merge changelog

the changelog should just collect all added lines, no conflict resolution
necessary
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..dc8bb38
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+doc/changelog.rst merge=union
-- 
GitLab