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