Update branch name and remove .gitattributes

2015-10-19 08:01:18 -07:00 · 2015-10-19 08:01:18 -07:00 · 3242e624d5
commit 3242e624d5
parent 566f393b49
2 changed files with 1 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-.travis.yml merge=keep-ours
--- a/.travis.yml
+++ b/.travis.yml
@ -17,6 +17,6 @@ addons:
    notification_email: victor.zverovich@gmail.com
    build_command_prepend: cmake .
    build_command: make -j4
-    branch_pattern: coverity_scan
+    branch_pattern: coverity

 script: true