Skip to content

Commit 8658d62

Browse files
Remove bad merge
1 parent 69c7841 commit 8658d62

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

src/libs/API/types.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,11 +486,7 @@ const WRITE_COMMANDS = {
486486
COMPLETE_CONCIERGE_CALL: 'CompleteConciergeCall',
487487
FINISH_CORPAY_BANK_ACCOUNT_ONBOARDING: 'FinishCorpayBankAccountOnboarding',
488488
REOPEN_REPORT: 'ReopenReport',
489-
<<<<<<< HEAD
490-
GET_GUIDE_CALL_AVAILABILITY_SCHEDULE: 'GetGuideCallAvailabilitySchedule',
491489
TRAVEL_SIGNUP_REQUEST: 'RequestTravelAccess',
492-
=======
493-
>>>>>>> 93a63a6d19645feef8cc440d967de0435ce86a5b
494490
} as const;
495491

496492
type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;

0 commit comments

Comments
 (0)