Fix conflict in .travis.yml

tngan · Feb 3, 2017 · e549f78 · e549f78
1 parent 0e112c1
commit e549f78
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,9 @@
 language: node_js
 node_js:
-<<<<<<< HEAD
-    - "4"
-    - "5"
-    - "6"
-	- "7"
-=======
   - "4"
   - "5"
   - "6"
   - "7"
->>>>>>> origin
 branches:
   only:
   - master