merge conflicts

[arvados-workbench2.git] / src / store / store.ts

diff --git a/src/store/store.ts b/src/store/store.ts
index adb7ddde133d8ac0b6c07e82d6d702017ed0bd10..01b06b9528a727cd3cb9642a16bffeb0e17954ea 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -14,6 +14,7 @@ import { dataExplorerReducer, DataExplorerState } from './data-explorer/data-exp
 import { projectPanelMiddleware } from './project-panel/project-panel-middleware';
 import { detailsPanelReducer, DetailsPanelState } from './details-panel/details-panel-reducer';
 import { contextMenuReducer, ContextMenuState } from './context-menu/context-menu-reducer';
+import { reducer as formReducer } from 'redux-form';
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -37,7 +38,8 @@ const rootReducer = combineReducers({
     dataExplorer: dataExplorerReducer,
     sidePanel: sidePanelReducer,
     detailsPanel: detailsPanelReducer,
-    contextMenu: contextMenuReducer
+    contextMenu: contextMenuReducer,
+    form: formReducer
 });