diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue index 0b4250c68..4f1786a67 100644 --- 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 - - ======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80