Keep our .travis.yml during merge

because it contains Coverity Scan configuration.
This commit is contained in:
vitaut 2015-07-31 09:38:08 -07:00
parent b634309a31
commit 1e8496da4a

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
.travis.yml merge=ours