rebased

redben · Dec 3, 2018 · 03a8d62 · 03a8d62
1 parent 5bb125f
commit 03a8d62
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,7 @@
 language: node_js
 node_js:
-<<<<<<< 56002b0bd3baa5230982bceace8233827676982d
-  - v11
-  - v10
-  - v8
-=======
 - v8
 - v6
->>>>>>> getting travis right
 after_script: cat ./coverage/lcov.info | coveralls
 deploy:
   on: