Resolve conflict

This commit is contained in:
Graham Fairweather 2018-01-17 07:58:30 +01:00
parent 168565e45f
commit 074ad8aa40
3 changed files with 1788 additions and 584 deletions

View file

@ -53,7 +53,7 @@
},
"devDependencies": {
"autoprefixer-loader": "^2.0.0",
"babel": "^6.23.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-loader": "^6.4.1",
"babel-plugin-transform-runtime": "^6.12.0",