Keep our .travis.yml during merge
because it contains Coverity Scan configuration.
This commit is contained in:
1 parent
b634309a31
commit
1e8496da4a
1 file changed
+1
@@ -0,0 +1 @@
|
||||
.travis.yml merge=ours
|
||||
Reference in new issue
Block a user