From ebfc2771d41a6ab043595d3c621528aee020e2f9 Mon Sep 17 00:00:00 2001
From: Michael Ciniawsky <michael.ciniawsky@gmail.com>
Date: Fri, 16 Feb 2018 03:37:40 +0100
Subject: [PATCH] ci(.travis): add node `lts/*` && `stable` (#7)

---
 .travis.yml  | 6 +++---
 package.json | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9dbf513b..d896c756 100644
--- 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
index bf09b3e2..be133ea0 100644
--- 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"
   },