merge conflicts

[arvados-workbench2.git] / package.json

diff --git a/package.json b/package.json
index 0c06a6f17a357115da8c6897f0f159de7da51084..06fa893f97abe1dbcd18523df1deebf0d2660a3e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "@material-ui/core": "1.4.0",
     "@material-ui/icons": "1.1.0",
     "@types/lodash": "4.14.112",
+    "@types/redux-form": "^7.4.1",
     "axios": "0.18.0",
     "classnames": "2.2.6",
     "lodash": "4.17.10",
@@ -40,11 +41,13 @@
     "@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",
     "jest-localstorage-mock": "2.2.0",
     "redux-devtools": "3.4.1",
+    "redux-form": "^7.4.2",
     "typescript": "2.9.2"
   },
   "moduleNameMapper": {