fixed conflicts

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

diff --git a/src/store/store.ts b/src/store/store.ts
index 3f1f4a25b4ed4ce6e57b3ecdeb05117c45fe5915..4ab0918e60fb0ac6a636d03e4f95d0d9d3c6e468 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -44,6 +44,7 @@ import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-res
 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';
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -113,5 +114,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({
     runProcessPanel: runProcessPanelReducer,
     appInfo: appInfoReducer,
     searchBar: searchBarReducer,
-    virtualMachines: virtualMachinesReducer
+    virtualMachines: virtualMachinesReducer,
+    repositories: repositoriesReducer
 });