fix: Remove git conflict markers from .travis.yaml.

amiller-gh · web-flow · commit 317999892f9f · 2018-08-15T09:32:12.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,7 @@ language: node_js
 
 node_js:
   - "8"
-<<<<<<< HEAD
   - "9"
-=======
->>>>>>> test: Have Travis use node versions 8 and 10.
   - "10"
 
 env:
