Skip to content

Commit

Permalink
Merge branch 'main' into refactor/shadow-screen-modal
Browse files Browse the repository at this point in the history
# Conflicts:
#	apps/web/src/app/[locale]/mypage/(github-custom)/FarmPersonaSelect.tsx
#	apps/web/src/app/[locale]/mypage/(github-custom)/LinePersonaSelect.tsx
#	apps/web/src/app/[locale]/mypage/my-pet/(merge)/MergePersona.tsx
#	apps/web/src/app/[locale]/shop/PetGotcha/TenPet.tsx
#	packages/ui/panda/src/components/Dialog/Dialog.styles.ts.tsx
#	packages/ui/panda/src/components/Dialog/Dialog.tsx
#	packages/ui/panda/src/components/Dialog/index.ts
#	packages/ui/panda/src/components/Modal/Modal.tsx
#	packages/ui/panda/src/components/Modal/ScreenModal.tsx
#	packages/ui/panda/src/components/Modal/index.ts
  • Loading branch information
sumi-0011 committed Nov 21, 2024
2 parents 7aaa01e + 4e00a2f commit f7292cb
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit f7292cb

Please sign in to comment.