Fix merge conflicts

This commit is contained in:
Elliot DeNolf
2018-09-27 12:00:58 -04:00
13 changed files with 270 additions and 207 deletions

View File

@@ -55,6 +55,7 @@
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.2",
"circular-dependency-plugin": "^5.0.2",
"css-loader": "^1.0.0",
"eslint": "^4.19.1",
"eslint-plugin-react": "^7.11.1",