Browse Source

Update .gitattributes

Julien Schmidt 13 years ago
parent
commit
20de6772d6
1 changed files with 0 additions and 1 deletions
  1. 0 1
      .gitattributes

+ 0 - 1
.gitattributes

@@ -1,2 +1 @@
-.travis.yml merge=ours
 README.md merge=ours
 README.md merge=ours