Skip to content

Commit c071ab7

Browse files
committed
Add .gitattributes for merging gradle.properties
1 parent e82c629 commit c071ab7

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
gradle.properties merge=ours
2+

0 commit comments

Comments
 (0)