Merge branch 'dev' into fix_customer_issues

2024-11-07 13:06:33 +01:00 · 2024-11-07 13:06:33 +01:00 · e210ad7de4
parent 489df51d64
commit e210ad7de4
1 changed files with 0 additions and 4 deletions
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@ -63,11 +63,7 @@ const columns = computed(() => [
    },
    {
        align: 'left',
-<<<<<<< HEAD
        format: (row) => dashIfEmpty(row.agencyMode?.name),
-=======
-        format: (row, dashIfEmpty) => dashIfEmpty(row.agencyMode?.name),
->>>>>>> dev
        columnClass: 'expand',
        label: t('Agency'),
    },