From d017876f37f2b753c76881d28111d8cd6f95185e Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 17 Jun 2024 02:14:51 +0200
Subject: [PATCH] Automerge changelog

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

diff --git a/.gitattributes b/.gitattributes
index 9079692dc..f0e8588ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 *.ps1 eol=crlf
 *.cmd eol=crlf
 ReadMe.md merge=ours
+ChangeLog.md merge=ours