Coverity+Travis CI attempt to fix

.travis.yml

@@ -1,34 +1,11 @@
 # Travis CI configuration
-<<<<<<< HEAD
-# For coverity_scan branch only
-=======
-# Note: there are currently issues with limiting coverity to a single compiler
-#       see https://github.com/travis-ci/travis-ci/issues/1975
-#       Instead we use a script to decide if we should do anything
->>>>>>> develop
 
 language: c
 compiler: gcc
 os: linux
 
 sudo: false
 
-install: echo 'Install step'
-script: echo 'Script step'
-
-<<<<<<< HEAD
-after_deploy: cat /home/travis/build/mcveanlab/mccortex/cov-int/scm_log.txt
-=======
-before_install:
-  - git submodule update --init --recursive
-
-install:
-  - ./travis/install.sh
-  - eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
-
-script: ./travis/script.sh
->>>>>>> develop
-
 env:
   global:
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -41,8 +18,8 @@ addons:
       name: "mcveanlab/mccortex"
       description: "Build submitted via Travis CI"
     notification_email: [email protected]
-    build_command_prepend: "make clean"
-    build_command:   "make all"
+    build_command_prepend: make clean
+    build_command: make all
     branch_pattern: coverity_scan
 
 notifications: