Skip to content
Permalink
Browse files

.gitattributes

  • Loading branch information...
hsz committed Jul 23, 2018
1 parent 323cf81 commit 0eec964c2f0fb02429b6d3a70a03b62f69d94b1d
Showing with 2 additions and 0 deletions.
  1. +2 −0 .gitattributes
@@ -0,0 +1,2 @@
.travis.yml merge=ours
gradle.properties merge=ours

0 comments on commit 0eec964

Please sign in to comment.
You can’t perform that action at this time.