intentando resolver conflictos

Browse Source

...

This commit is contained in:

jaimejimenezortega

2024-05-08 20:44:40 +02:00

parent e2b998bfa4

commit feebbed24d

135 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

ci4/app/Views/themes/backend/vuexy/form/activity/activityList.php → ci4/app/Views/themes/vuexy/form/activity/activityList.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php → ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteDireccionesForm.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php → ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/convert2templateModal.php → ci4/app/Views/themes/vuexy/form/clientes/cliente/convert2templateModal.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php → ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteList.php → ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteList.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php → ci4/app/Views/themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php → ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/viewContactoDeClienteList.php → ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteList.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/distribuidores/_distribuidorDeClienteFormItems.php → ci4/app/Views/themes/vuexy/form/clientes/distribuidores/_distribuidorDeClienteFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteForm.php → ci4/app/Views/themes/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteForm.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteList.php → ci4/app/Views/themes/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteList.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/plantillaprecios/_ClienteplantillapreciosFormItems.php → ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/_ClienteplantillapreciosFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php → ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php

0

ci4/app/Views/themes/backend/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php → ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php

0

ci4/app/Views/themes/backend/vuexy/form/compras/proveedores/_proveedorFormItems.php → ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/compras/proveedores/_proveedorTipoFormItems.php → ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorTipoFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/compras/proveedores/viewProveedorForm.php → ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php

0

ci4/app/Views/themes/backend/vuexy/form/compras/proveedores/viewProveedorList.php → ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorList.php

0

ci4/app/Views/themes/backend/vuexy/form/compras/proveedores/viewProveedorTipoForm.php → ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorTipoForm.php

0

ci4/app/Views/themes/backend/vuexy/form/compras/proveedores/viewProveedorTipoList.php → ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorTipoList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php → ci4/app/Views/themes/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php → ci4/app/Views/themes/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/_formaDePagoFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/formas-pago/_formaDePagoFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php → ci4/app/Views/themes/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php → ci4/app/Views/themes/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/_imposicionFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/_imposicionFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/viewImposicionForm.php → ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/viewImposicionList.php → ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/maquinas/_maquinaFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php → ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php → ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php → ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php → ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/_paisFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/paises/_paisFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php → ci4/app/Views/themes/vuexy/form/configuracion/paises/viewPaisForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php → ci4/app/Views/themes/vuexy/form/configuracion/paises/viewPaisList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelGenericoFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/papel/_papelGenericoFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/papel/_papelImpresionFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php → ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelGenericoForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoList.php → ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelGenericoList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php → ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php → ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papelformato/_papelFormatoFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/papelformato/_papelFormatoFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papelformato/viewPapelFormatoForm.php → ci4/app/Views/themes/vuexy/form/configuracion/papelformato/viewPapelFormatoForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/papelformato/viewPapelFormatoList.php → ci4/app/Views/themes/vuexy/form/configuracion/papelformato/viewPapelFormatoList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/_provinciaFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/provincias/_provinciaFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaForm.php → ci4/app/Views/themes/vuexy/form/configuracion/provincias/viewProvinciaForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaList.php → ci4/app/Views/themes/vuexy/form/configuracion/provincias/viewProvinciaList.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/_tipologiaLibrosFormItems.php → ci4/app/Views/themes/vuexy/form/configuracion/tipologias/_tipologiaLibrosFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/viewTipologiaLibrosForm.php → ci4/app/Views/themes/vuexy/form/configuracion/tipologias/viewTipologiaLibrosForm.php

0

ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php → ci4/app/Views/themes/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php

0

ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php → ci4/app/Views/themes/vuexy/form/group/viewUserGroupForm.php

0

ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php → ci4/app/Views/themes/vuexy/form/group/viewUserGroupList.php

0

ci4/app/Views/themes/backend/vuexy/form/my/notification.php → ci4/app/Views/themes/vuexy/form/my/notification.php

0

ci4/app/Views/themes/backend/vuexy/form/my/view.php → ci4/app/Views/themes/vuexy/form/my/view.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/buscador/viewBuscadorList.php → ci4/app/Views/themes/vuexy/form/presupuestos/buscador/viewBuscadorList.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/_datosLibroItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/_datosLibroItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/_direccionesItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/_direccionesItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/_disenioLibroItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/_disenioLibroItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/_tipoLibroItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/_tipoLibroItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/direcciones.js → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/direcciones.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/disenioLibro.js → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/disenioLibro.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/loader.php → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/loader.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/presupuestoCliente.js → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/presupuestoCliente.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/tipoLibroItems.js → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/tipoLibroItems.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php → ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_comentariosItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_comentariosItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/previews.js

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php → ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/index.php → ci4/app/Views/themes/vuexy/form/presupuestos/index.php

0

ci4/app/Views/themes/backend/vuexy/form/presupuestos/tapa-blanda-encolada.php → ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php

0

ci4/app/Views/themes/backend/vuexy/form/profile/index.php → ci4/app/Views/themes/vuexy/form/profile/index.php

0

ci4/app/Views/themes/backend/vuexy/form/profile/index_old.php → ci4/app/Views/themes/vuexy/form/profile/index_old.php

0

ci4/app/Views/themes/backend/vuexy/form/settings/_settingsFormItems.php → ci4/app/Views/themes/vuexy/form/settings/_settingsFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php → ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php

0

ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php → ci4/app/Views/themes/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php

0

ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php → ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php

0

ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php → ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php

Some files were not shown because too many files have changed in this diff Show More