merge-conflicts

[arvados-workbench2.git] / src / models / workflow.ts

diff --git a/src/models/workflow.ts b/src/models/workflow.ts
index 2054550dc09f662730e086551a1ab1847438996f..e0a5df4381c2dd8c4ed9c04fddd8b083559ffec3 100644 (file)
--- a/src/models/workflow.ts
+++ b/src/models/workflow.ts
@@ -2,8 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource } from "../common/api/common-resource-service";
-import { ResourceKind } from "./kinds";
+import { Resource, ResourceKind } from "./resource";
 
 export interface WorkflowResource extends Resource {
     kind: ResourceKind.Workflow;