Fix typo

bobbyzhu · Feb 27, 2015 · 8794bc1 · 8794bc1
1 parent 939b9bd
commit 8794bc1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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