Skip to content

Commit 51fc4bd

Browse files
julienschmidtjulienschmidt
committed
Create .gitattributes
1 parent 30b144f commit 51fc4bd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.travis.yml merge=ours
2+
README.md merge=ours

0 commit comments

Comments
 (0)