feat: refs #7731 resolve conflicts

2025-01-23 09:05:49 +01:00 · 2025-01-23 09:05:49 +01:00 · c884c09943
parent 32191fe713
commit c884c09943
1 changed files with 0 additions and 4 deletions
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@ -69,12 +69,8 @@ function handleLocation(data, location) {
                'supplierActivityFk',
                'healthRegister',
                'street',
-<<<<<<< HEAD
                'viesCode',
-=======
-                'isVies',
                'isTrucker',
->>>>>>> d499565ca30fdb6c505e53c85642e15fc02588c6
            ],
            include: [
                {