Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test
Reviewed-on: #359 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
0e7c2c7118
|
@ -86,13 +86,6 @@ const maritalStatus = [
|
||||||
:label="t('Mobile extension')"
|
:label="t('Mobile extension')"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
<<<<<<< HEAD
|
|
||||||
<VnInput
|
|
||||||
v-model="data.client.phone"
|
|
||||||
:label="t('Personal phone')"
|
|
||||||
clearable
|
|
||||||
/>
|
|
||||||
======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
|
|
Loading…
Reference in New Issue