verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

7489-testToMaster #408

Merged
alexm merged 292 commits from 7489-testToMaster into master 2024-05-28 05:33:17 +00:00
Conversation 0 Commits 292 Files Changed 210 -7
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7504e5d12c - Show all commits

7
src/pages/Worker/Card/WorkerBasicData.vue
View File

@ -86,13 +86,6 @@ const maritalStatus = [
:label="t('Mobile extension')"
clearable
/>
<<<<<<< HEAD
<VnInput
v-model="data.client.phone"
:label="t('Personal phone')"
clearable
/>
======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">