merge conflicts

[arvados.git] / src / services / project-service / project-service.test.ts

diff --git a/src/services/project-service/project-service.test.ts b/src/services/project-service/project-service.test.ts
index 76da3d860a2cf730b0cb780fa7c150f9be410149..f915c2dfb7939653fba3ac54a3533fd340d4bb4f 100644 (file)
--- a/src/services/project-service/project-service.test.ts
+++ b/src/services/project-service/project-service.test.ts
@@ -3,9 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import axios from "axios";
-import MockAdapter from "axios-mock-adapter/types";
-import ProjectService from "./project-service";
-import FilterBuilder from "../../common/api/filter-builder";
+import { ProjectService } from "./project-service";
+import { FilterBuilder } from "../../common/api/filter-builder";
 import { ProjectResource } from "../../models/project";
 
 describe("CommonResourceService", () => {
@@ -35,5 +34,5 @@ describe("CommonResourceService", () => {
             }
         });
     });
-    
+
 });