Add CHANGELOG.md to .gitattributes

rubensworks · rubensworks · commit cd4151343de9 · 2025-11-15T06:41:05.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 gradle.properties merge=ours
 src/main/resources/META-INF/mods.toml merge=ours
+CHANGELOG.md merge=ours

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`gradle.properties merge=ours`
`2`	`2`	`src/main/resources/META-INF/mods.toml merge=ours`
	`3`	`+CHANGELOG.md merge=ours`