From 6d4a554d7b0cd62127648cc405d84488cc245600 Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@gmail.com>
Date: Tue, 12 Sep 2023 19:57:12 +0200
Subject: [PATCH] Add mods.toml to .gitattributes

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

diff --git a/.gitattributes b/.gitattributes
index 23c9c5a48..e0c567b72 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
 gradle.properties merge=ours
-
+src/main/resources/META-INF/mods.toml merge=ours