From f56a70b13dc49961b84e498db1ab0007a716565f Mon Sep 17 00:00:00 2001
From: Chris <cs@weblogixx.de>
Date: Fri, 29 Jan 2016 13:54:28 +0100
Subject: [PATCH] Fix: Removed karma-phantomjs-shim from packages list and
 karma (it is no longer needed in phantomjs 2)

---
 CHANGELOG.md  | 4 ++++
 karma.conf.js | 2 +-
 package.json  | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd98b3..4fa25c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # react-webpack-template - Changelog
 
+## 1.3.1:
+
+1. Removed karma-phantomjs-shim (with PhantomJS 2 there is no need for shims anymore)
+
 ## 1.3.0:
 
 1. Updated phantomjs to 2.0
diff --git a/karma.conf.js b/karma.conf.js
index 38365c6..4ef657b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -9,7 +9,7 @@ module.exports = function(config) {
     ],
     port: 8080,
     captureTimeout: 60000,
-    frameworks: [ 'phantomjs-shim', 'mocha', 'chai' ],
+    frameworks: [ 'mocha', 'chai' ],
     client: {
       mocha: {}
     },
diff --git a/package.json b/package.json
index 427e93e..c701e72 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "karma-mocha": "^0.2.0",
     "karma-mocha-reporter": "^1.1.1",
     "karma-phantomjs-launcher": "^1.0.0",
-    "karma-phantomjs-shim": "^1.1.1",
     "karma-sourcemap-loader": "^0.3.5",
     "karma-webpack": "^1.7.0",
     "lodash": "^4.0.0",