Repara mbsERP.4pw: resuelve conflicto sin resolver del commit 93a4eb4

Browse Source

El merge 93a4eb4 subio el .4pw con marcadores de conflicto (ambas versiones
pegadas). Se rehizo el merge de 16ef058 y 9bc9170 normalizando los saltos de
linea (16ef058 estaba en LF, el resto en CRLF). Resultado: XML valido, 233
aplicaciones sin duplicados, conserva registros de ipprmt044/045 y los de
adprmt001/017/027 y cpprrp002.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

...

This commit is contained in:

jpeguero

2026-10-21 08:37:05 -04:00

co-authored by Claude Sonnet 5.5

parent 93a4eb40f5

commit 7dfed7798c

1 changed files with 72 additions and 1579 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

PROYECTO/mbsERP.4pw

+72 -1579

File diff suppressed because it is too large Load Diff