From 56c730d26ffb94ce6a3327c5be36ce3219722954 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Thu, 7 Mar 2024 14:04:36 +0100
Subject: [PATCH] Enable auto merge of CHANGELOG.md (#10986)

---
 .gitattributes | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 051e3cc80e6..237079524ae 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,5 +11,4 @@ gradlew text eol=lf
 *.java text eol=lf
 *.properties text eol=lf
 
-# disable after a release (otherwise, duplicate CHANGELOG.md entries will be generated)
-# CHANGELOG.md merge=union
+CHANGELOG.md merge=union