cleaning up

2017-06-26 12:24:51 -07:00
parent 15177a20d4
commit d796390737
1 changed files with 0 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 sudo: false
 script: test/run
 language: c
-<<<<<<< HEAD
 os:
  - linux
  - osx