aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-26 17:12:36 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-26 17:12:36 -0800
commit8794bc182fc346a0b67cb577bd79899dd8a29772 (patch)
treeb046b2f132f6e37c06984938b3c91c7f187fd89b /.travis.yml
parent939b9bd1953827b416cc55819772f0af6f473eca (diff)
Fix typo
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml1
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