chore: resolved conflict
This commit is contained in:
parent
8b04f3da3e
commit
136aa73822
@ -10,11 +10,7 @@
|
||||
</Breadcrumbs>
|
||||
</header>
|
||||
</LayoutHeader>
|
||||
<<<<<<< HEAD
|
||||
<div v-if="contact.data" class="flex flex-col h-full overflow-hidden">
|
||||
=======
|
||||
<div v-if="contact.doc" class="flex flex-col h-full overflow-hidden">
|
||||
>>>>>>> 42ea1ad1 (fix: useDocument in contact page)
|
||||
<FileUploader
|
||||
@success="changeContactImage"
|
||||
:validateFile="validateIsImageFile"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user