chore: conflict 해결

HanaFun · Jul 3, 2024 · 1ea6f80 · 1ea6f80
1 parent 0767853
commit 1ea6f80
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 243 deletions.
diff --git a/public/data/hostLesson.json b/public/data/hostLesson.json
diff --git a/public/data/hostLessonDetail.json b/public/data/hostLessonDetail.json
diff --git a/public/data/lessonDetail.json b/public/data/lessonDetail.json
diff --git a/public/data/monthRevenue.json b/public/data/monthRevenue.json
diff --git a/public/data/myLesson.json b/public/data/myLesson.json
diff --git a/public/data/myLessonAll.json b/public/data/myLessonAll.json
diff --git a/src/apis/apiClient.ts b/src/apis/apiClient.ts
@@ -11,7 +11,6 @@ import {
   HostInfoType,
 } from '../types/host';
 import { transactionApi } from './interfaces/transactionApi';
-import { PaybackReqType, QrPayReqType } from '../types/transaction';
 
 export class ApiClient
   implements userApi, accountApi, hostApi, categoryApi, transactionApi

diff --git a/src/apis/interfaces/transactionApi.ts b/src/apis/interfaces/transactionApi.ts
@@ -1,5 +1,3 @@
-import { PaybackReqType, QrPayReqType } from '../../types/transaction';
-
 export interface transactionApi {
   postQrPay(reqData: QrPayReqType): Promise<BaseResponseType<PayResType>>;