ci(.travis): add node lts/* && stable (#7)

jantimon · Feb 16, 2018 · ebfc277 · ebfc277
1 parent 55aab64
commit ebfc277
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "4"
-  - "5"
-  - "6"
+  - stable
+  - lts/*
+  - 6
 env:
   - WEBPACK_VERSION=1 EXTRACT_PLUGIN_VERSION=1
   - WEBPACK_VERSION=2 EXTRACT_PLUGIN_VERSION=2

diff --git a/package.json b/package.json
@@ -52,7 +52,6 @@
     "toposort": "^1.0.0"
   },
   "peerDependencies": {
-<<<<<<< HEAD
     "extract-text-webpack-plugin": "^1.0.0 || ^2.0.0 || 3.0.0 || ^4.0.0-alpha.0 || ^4.0.0",
     "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0-beta.1 || ^4.0.0"
   },