Skip to content

Commit

Permalink
fix(conflict): resolve conflict arising from two independent PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
oyo committed Sep 11, 2024
1 parent 6d00415 commit b7032de
Showing 1 changed file with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ export const statusColorMap: Record<
ComponentProps<typeof StatusTag>['color']
> = {
[ServiceAccountStatus.ACTIVE]: 'confirmed',
[ServiceAccountStatus.INACTIVE]: 'declined',
[ServiceAccountStatus.DELETED]: 'deleted',
[ServiceAccountStatus.PENDING]: 'pending',
[ServiceAccountStatus.PENDING_DELETION]: 'pending',
}
Expand Down

0 comments on commit b7032de

Please sign in to comment.