From 3242e624d5cdab4d130ff7467740e0a1d928cfbb Mon Sep 17 00:00:00 2001 From: vitaut Date: Mon, 19 Oct 2015 08:01:18 -0700 Subject: [PATCH] Update branch name and remove .gitattributes --- .gitattributes | 1 - .travis.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 2986db56..00000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -.travis.yml merge=keep-ours diff --git a/.travis.yml b/.travis.yml index d7621c8d..02121786 100644 --- 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