From eee0bb3ef13707f8fbce8cd8b26c3168e97c3a17 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 5 Feb 1996 09:21:39 +0000 Subject: [PATCH] Corretto conflitto git-svn-id: svn://10.65.10.50/trunk@2556 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2104.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cg/cg2104.cpp b/cg/cg2104.cpp index e3f438318..73845e084 100755 --- a/cg/cg2104.cpp +++ b/cg/cg2104.cpp @@ -906,7 +906,7 @@ void TPrimanota_application::write_scadenze(const TMask& m) TToken_string& row = ps.row(i); TRiga_scadenze& scadenza = partita.new_row(); -<<<<<<< cg2104.cpp + scadenza.put(SCAD_CODPAG, codpag); // Codice pagamento scadenza.put(SCAD_CODAG, agente); // Codice agente