diff options
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b2f2c51c02..94c51e1a93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ before_install: - sudo add-apt-repository ppa:yjwong/gflags -y - sudo apt-get update -qq - sudo apt-get install -qq libgtest-dev libgflags-dev -<<<<<<< HEAD script: - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c dbg |