Updated Travis CI build file.

xbrowsersync · Feb 21, 2017 · df80862 · df80862
1 parent c02f129
commit df80862
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,6 @@ language: node_js
 node_js:
   - "node"
   - "iojs"
-<<<<<<< HEAD
-=======
-env:
-  - TRAVIS_BUILD_NUMBER='1.2.1'
->>>>>>> v1.2.1
 install:
   - npm install
 script: