From c884c0994336cac4df6262693f5e5177828e5b3c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 23 Jan 2025 09:05:49 +0100
Subject: [PATCH] feat: refs #7731 resolve conflicts

---
 src/pages/Supplier/Card/SupplierFiscalData.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index b944cdf69..dfd214d1d 100644
--- 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: [
                 {