Updated Travis CI build file.

nero120 · nero120 · commit df808627595a · 2017-02-21T19:06:16.000Z
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:
