Skip to content

Commit df68aa6

Browse files
rubensworksrubensworks
committed
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
2 parents 051707d + 1acdb81 commit df68aa6

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
gradle.properties merge=ours
22
src/main/resources/META-INF/mods.toml merge=ours
33
src/main/resources/META-INF/neoforge.mods.toml merge=ours
4+
CHANGELOG.md merge=ours

0 commit comments

Comments
 (0)