merge conflicts

[arvados-workbench2.git] / package.json

diff --git a/package.json b/package.json
index a8c56177bfeaf5e4dadcbb3c063709ab1a4d98e7..06fa893f97abe1dbcd18523df1deebf0d2660a3e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -3,12 +3,12 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "1.2.1",
+    "@material-ui/core": "1.4.0",
     "@material-ui/icons": "1.1.0",
-    "@types/lodash": "4.14.109",
+    "@types/lodash": "4.14.112",
     "@types/redux-form": "^7.4.1",
     "axios": "0.18.0",
-    "classnames": "^2.2.6",
+    "classnames": "2.2.6",
     "lodash": "4.17.10",
     "react": "16.4.1",
     "react-dom": "16.4.1",
@@ -30,21 +30,21 @@
   },
   "devDependencies": {
     "@types/classnames": "^2.2.4",
-    "@types/enzyme": "3.1.10",
+    "@types/enzyme": "3.1.12",
     "@types/enzyme-adapter-react-16": "1.0.2",
-    "@types/jest": "23.1.0",
-    "@types/node": "10.3.3",
-    "@types/react": "16.3",
+    "@types/jest": "23.3.0",
+    "@types/node": "10.5.2",
+    "@types/react": "16.4",
     "@types/react-dom": "16.0.6",
-    "@types/react-redux": "6.0.2",
-    "@types/react-router": "4.0.26",
+    "@types/react-redux": "6.0.4",
+    "@types/react-router": "4.0.29",
     "@types/react-router-dom": "4.2.7",
     "@types/react-router-redux": "5.0.15",
     "@types/redux-devtools": "3.0.44",
     "@types/redux-form": "^7.4.1",
-    "axios-mock-adapter": "^1.15.0",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.1",
+    "axios-mock-adapter": "1.15.0",
+    "enzyme": "3.3.0",
+    "enzyme-adapter-react-16": "1.1.1",
     "jest-localstorage-mock": "2.2.0",
     "redux-devtools": "3.4.1",
     "redux-form": "^7.4.2",