test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-07-05 14:39:32 +05:30 committed by GitHub
parent 8b04f3da3e
commit 136aa73822
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/pages/MobileContact.vue
View File

@ -10,11 +10,7 @@
</Breadcrumbs> </Breadcrumbs>
</header> </header>
</LayoutHeader> </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"> <div v-if="contact.doc" class="flex flex-col h-full overflow-hidden">
>>>>>>> 42ea1ad1 (fix: useDocument in contact page)
<FileUploader <FileUploader
@success="changeContactImage" @success="changeContactImage"
:validateFile="validateIsImageFile" :validateFile="validateIsImageFile"