Fix merge conflicts
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user