diff --git a/.travis.yml b/.travis.yml
index b15c9fbf..b3fa2728 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 sudo: false
 script: test/run
 language: c
-<<<<<<< HEAD
 os:
   - linux
   - osx