conflicts

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

diff --git a/src/store/store.ts b/src/store/store.ts
index 5e648c99ef9efadd32dffba96a493cd8dde2c397..f8bdcc24c6efee4f3b6811a05fb48b86c3cb1ee1 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -43,7 +43,9 @@ import { searchBarReducer } from './search-bar/search-bar-reducer';
 import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-results-panel-actions';
 import { SearchResultsMiddlewareService } from './search-results-panel/search-results-middleware-service';
 import { resourcesDataReducer } from "~/store/resources-data/resources-data-reducer";
+import { virtualMachinesReducer } from "~/store/virtual-machines/virtual-machines-reducer";
 import { repositoriesReducer } from '~/store/repositories/repositories-reducer';
+import { keepServicesReducer } from '~/store/keep-services/keep-services-reducer';
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -113,5 +115,7 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({
     runProcessPanel: runProcessPanelReducer,
     appInfo: appInfoReducer,
     searchBar: searchBarReducer,
-    repositories: repositoriesReducer
+    virtualMachines: virtualMachinesReducer,
+    repositories: repositoriesReducer,
+    keepServices: keepServicesReducer
 });