[Resolved Conlfict] Merge origin next to local.
This commit is contained in:
12
package.json
12
package.json
@@ -37,7 +37,7 @@
|
||||
"jss-rtl": "^0.2.1",
|
||||
"keycode": "^2.1.9",
|
||||
"lodash": "^4.17.4",
|
||||
"material-ui": "1.0.0-beta.38",
|
||||
"material-ui": "^1.0.0-beta.40",
|
||||
"material-ui-icons": "^1.0.0-beta.17",
|
||||
"moment": "^2.18.1",
|
||||
"morgan": "^1.8.1",
|
||||
@@ -83,7 +83,7 @@
|
||||
"@types/classnames": "^2.2.3",
|
||||
"@types/jest": "^22.1.1",
|
||||
"@types/lodash": "^4.14.77",
|
||||
"@types/node": "^9.4.0",
|
||||
"@types/node": "^9.6.2",
|
||||
"@types/prop-types": "^15.5.2",
|
||||
"@types/react": "^16.0.36",
|
||||
"@types/react-dom": "^16.0.3",
|
||||
@@ -95,12 +95,12 @@
|
||||
"@types/react-tap-event-plugin": "0.0.30",
|
||||
"@types/redux-logger": "^3.0.4",
|
||||
"@types/uuid": "^3.4.3",
|
||||
"redux-logger": "^3.0.1",
|
||||
"redux-logger": "^3.0.6",
|
||||
"redux-mock-store": "^1.2.3",
|
||||
"ts-node": "^3.3.0",
|
||||
"tslint": "^5.7.0",
|
||||
"ts-node": "^5.0.1",
|
||||
"tslint": "^5.9.1",
|
||||
"tslint-config-standard": "^6.0.1",
|
||||
"typescript": "^2.7.1"
|
||||
"typescript": "^2.7.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": "8.9.4",
|
||||
|
||||
Reference in New Issue
Block a user