next conflicts

[arvados-workbench2.git] / src / store / users / user-panel-middleware-service.ts

diff --git a/src/store/users/user-panel-middleware-service.ts b/src/store/users/user-panel-middleware-service.ts
index 2f60209368ffc48afd266216e28f97398fc769ff..bc4bb130ae39797160eb3200c53adad51b30e101 100644 (file)
--- a/src/store/users/user-panel-middleware-service.ts
+++ b/src/store/users/user-panel-middleware-service.ts
@@ -12,7 +12,7 @@ import { updateResources } from '~/store/resources/resources-actions';
 import { FilterBuilder } from '~/services/api/filter-builder';
 import { SortDirection } from '~/components/data-table/data-column';
 import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
-import { ListResults } from '~/services/common-service/common-resource-service';
+import { ListResults } from '~/services/common-service/common-service';
 import { userBindedActions } from '~/store/users/users-actions';
 import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
 import { UserResource } from '~/models/user';