Update .travis.yml

jstransformers · Jun 30, 2015 · 55fae0b · 55fae0b
1 parent 757a405
commit 55fae0b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,6 @@ node_js:
   - "0.12"
   - "iojs"
 
-<<<<<<< HEAD
-after_success: npm run coveralls
-=======
 after_success:
   - npm run coverage
   - npm i coveralls
@@ -17,4 +14,3 @@ after_success:
 notifications:
   email:
     on_success: never
->>>>>>> cc437af7956a008faaf316bf344f7317e0827dfb