test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-06-05 16:18:48 +05:30 committed by GitHub
parent f1032b5f93
commit e93cc463be
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/components/Modals/OrganizationModal.vue
View File

@ -17,16 +17,12 @@
</Button> </Button>
</div> </div>
</div> </div>
<<<<<<< HEAD
<FieldLayout v-if="tabs.data?.length" :tabs="tabs.data" :data="_organization" doctype="CRM Organization" />
=======
<FieldLayout <FieldLayout
v-if="tabs.data?.length" v-if="tabs.data?.length"
:tabs="tabs.data" :tabs="tabs.data"
:data="organization.doc" :data="organization.doc"
doctype="CRM Organization" doctype="CRM Organization"
/> />
>>>>>>> 9362997 (refactor: organization modal code refactor)
<ErrorMessage class="mt-8" v-if="error" :message="__(error)" /> <ErrorMessage class="mt-8" v-if="error" :message="__(error)" />
</div> </div>
<div class="px-4 pt-4 pb-7 sm:px-6"> <div class="px-4 pt-4 pb-7 sm:px-6">