Patch level : 10.0

Files correlati     : cg2100b.msk cg2100c.msk
Ricompilazione Demo : [ ]
Commento            :
Risolti conflitti su campi contabilità separata


git-svn-id: svn://10.65.10.50/branches/R_10_00@22339 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2011-06-28 15:00:30 +00:00
parent 58af6aa6f6
commit 26ab92cc59
2 changed files with 0 additions and 8 deletions

View File

@ -268,11 +268,7 @@ BEGIN
FIELD CONTSEP
END
<<<<<<< cg2100b.uml
STRING F_DESCONTSEP 50 48
=======
STRING F_DESCONTSEP 50
>>>>>>> 1.78.2.6
BEGIN
PROMPT 27 19 ""
USE &NPENT KEY 2

View File

@ -658,11 +658,7 @@ BEGIN
FIELD CONTSEP
END
<<<<<<< cg2100c.uml
STRING F_DESCONTSEP 50 48
=======
STRING F_DESCONTSEP 50
>>>>>>> 1.127.2.6
BEGIN
PROMPT 27 19 ""
USE &NPENT KEY 2