Add .gitattributes for merging gradle.properties

CyclopsMC · Aug 29, 2023 · 5d94406 · 5d94406
1 parent dbdbddb
commit 5d94406
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+gradle.properties merge=ours
+