Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel

2024-05-07 16:36:34 +02:00 · 2024-05-07 16:36:34 +02:00 · 7504e5d12c
parent 014ec60e47 613492d04a
commit 7504e5d12c
1 changed files with 0 additions and 7 deletions
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@ -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">