granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix outstanding merge conflict

Browse source
This commit is contained in:
Justin Edmund 2023-08-20 04:44:13 -07:00
parent c5c7dde8ed
commit 44e5bc93f3
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/common/DialogContent/index.tsx
View file

@ -12,13 +12,8 @@ interface Props
HTMLDivElement HTMLDivElement
> { > {
wrapperClassName?: string wrapperClassName?: string
<<<<<<< HEAD
headerRef?: React.RefObject<HTMLDivElement> headerRef?: React.RefObject<HTMLDivElement>
footerRef?: React.RefObject<HTMLDivElement> footerRef?: React.RefObject<HTMLDivElement>
=======
headerref?: React.RefObject<HTMLDivElement>
footerref?: React.RefObject<HTMLDivElement>
>>>>>>> main
scrollable?: boolean scrollable?: boolean
onEscapeKeyDown: (event: KeyboardEvent) => void onEscapeKeyDown: (event: KeyboardEvent) => void
onOpenAutoFocus: (event: Event) => void onOpenAutoFocus: (event: Event) => void