From fe66f5d4bfbde33c8086bc82d7abb8acbf30d717 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 10 Dec 2023 02:31:46 +0000
Subject: [PATCH] Ignore readme merge conflicts

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

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