fix merge conflicts

palladiumkenya · Jan 13, 2025 · 4d8abb2 · 4d8abb2
1 parent 99bcb59
commit 4d8abb2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/packages/esm-billing-app/src/types/index.ts b/packages/esm-billing-app/src/types/index.ts
@@ -555,11 +555,6 @@ export interface Schema {
   commodities: Record<string, unknown>;
 }
 
-export interface Service {
-  concept: string;
-  description: string;
-}
-
 export type ServiceType = { uuid: string; display: string; id: number };
 
 export type ServiceTypesResponse = {

diff --git a/yarn.lock b/yarn.lock
@@ -7025,13 +7025,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ace-builds@npm:^1.36.3":
-  version: 1.36.5
-  resolution: "ace-builds@npm:1.36.5"
-  checksum: 10/b9e29c9ef2ed380f7eb3ff94777e82de9482344707ec348f241989d0377822c06d59ab18d881970e23983773de5c0ca1e5f9c710a7f18fb60ca9939df0cf97da
-  languageName: node
-  linkType: hard
-
 "ace-builds@npm:^1.36.3, ace-builds@npm:^1.36.5":
   version: 1.36.5
   resolution: "ace-builds@npm:1.36.5"