root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tolto conflitto inesistente

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@1230 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-04-11 10:52:03 +00:00
parent 6768cae309
commit ed2193010f
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cg/Attic/cg1400.cpp
View File

@ -133,12 +133,7 @@ int TStampa_deleghe_IVA::select()
TToken_string d(80); TToken_string d(80);
_ditte->destroy(); _ditte->destroy();
<<<<<<< cg1400.cpp
begin_wait(); begin_wait();
=======
begin_wait();
>>>>>>> 1.9
for (_nditte->first(); _nditte->good(); _nditte->next()) for (_nditte->first(); _nditte->good(); _nditte->next())
{ {
TLocalisamfile& anag = _nditte->lfile(LF_ANAG); TLocalisamfile& anag = _nditte->lfile(LF_ANAG);
@ -173,12 +168,8 @@ int TStampa_deleghe_IVA::select()
} }
} }
} }
<<<<<<< cg1400.cpp
end_wait(); end_wait();
=======
end_wait();
>>>>>>> 1.9
int res = 1; int res = 1;
if (_ditte->items() > 0) if (_ditte->items() > 0)
{ {

11
cg/cg1400.cpp
View File

@ -133,12 +133,7 @@ int TStampa_deleghe_IVA::select()
TToken_string d(80); TToken_string d(80);
_ditte->destroy(); _ditte->destroy();
<<<<<<< cg1400.cpp
begin_wait(); begin_wait();
=======
begin_wait();
>>>>>>> 1.9
for (_nditte->first(); _nditte->good(); _nditte->next()) for (_nditte->first(); _nditte->good(); _nditte->next())
{ {
TLocalisamfile& anag = _nditte->lfile(LF_ANAG); TLocalisamfile& anag = _nditte->lfile(LF_ANAG);
@ -173,12 +168,8 @@ int TStampa_deleghe_IVA::select()
} }
} }
} }
<<<<<<< cg1400.cpp
end_wait(); end_wait();
=======
end_wait();
>>>>>>> 1.9
int res = 1; int res = 1;
if (_ditte->items() > 0) if (_ditte->items() > 0)
{ {