Update branch name and remove .gitattributes

This commit is contained in:
vitaut 2015-10-19 08:01:18 -07:00
parent 566f393b49
commit 3242e624d5
2 changed files with 1 additions and 2 deletions

1
.gitattributes vendored
View File

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

View File

@ -17,6 +17,6 @@ addons:
notification_email: victor.zverovich@gmail.com notification_email: victor.zverovich@gmail.com
build_command_prepend: cmake . build_command_prepend: cmake .
build_command: make -j4 build_command: make -j4
branch_pattern: coverity_scan branch_pattern: coverity
script: true script: true