From 8794bc182fc346a0b67cb577bd79899dd8a29772 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Thu, 26 Feb 2015 17:12:36 -0800
Subject: [PATCH] Fix typo

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

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
-- 
GitLab