Update README.md

2017-06-05 13:32:24 -07:00
parent 2a0a425334
commit c1683c74d2
1 changed files with 1 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 sudo: false
 script: test/run
 language: c
+<<<<<<< HEAD
 os:
  - linux
  - osx