2024-01-11 12:22:28 +00:00
1 changed files with 0 additions and 6 deletions
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@ -565,12 +565,6 @@ const shouldRenderColumn = (colName) => {
 </style>

 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
-    Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
    Social name: Razón social
 </i18n>