From ed2193010fe7f89fd3bd51e1950d590ba0273854 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 11 Apr 1995 10:52:03 +0000
Subject: [PATCH] Tolto conflitto inesistente

git-svn-id: svn://10.65.10.50/trunk@1230 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/Attic/cg1400.cpp | 11 +----------
 cg/cg1400.cpp       | 11 +----------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/cg/Attic/cg1400.cpp b/cg/Attic/cg1400.cpp
index 2d9d7031a..4cf3ae67d 100755
--- a/cg/Attic/cg1400.cpp
+++ b/cg/Attic/cg1400.cpp
@@ -133,12 +133,7 @@ int TStampa_deleghe_IVA::select()
   TToken_string d(80);
 
   _ditte->destroy();
-<<<<<<< cg1400.cpp
   begin_wait();
-=======
-  
-  begin_wait();
->>>>>>> 1.9
   for (_nditte->first(); _nditte->good(); _nditte->next())
   {
     TLocalisamfile& anag = _nditte->lfile(LF_ANAG);
@@ -173,12 +168,8 @@ int TStampa_deleghe_IVA::select()
       }  
     }
   }
-<<<<<<< cg1400.cpp
   end_wait();
-=======
-  end_wait();
-  
->>>>>>> 1.9
+
   int res = 1;     
   if (_ditte->items() > 0)
   {
diff --git a/cg/cg1400.cpp b/cg/cg1400.cpp
index 2d9d7031a..4cf3ae67d 100755
--- a/cg/cg1400.cpp
+++ b/cg/cg1400.cpp
@@ -133,12 +133,7 @@ int TStampa_deleghe_IVA::select()
   TToken_string d(80);
 
   _ditte->destroy();
-<<<<<<< cg1400.cpp
   begin_wait();
-=======
-  
-  begin_wait();
->>>>>>> 1.9
   for (_nditte->first(); _nditte->good(); _nditte->next())
   {
     TLocalisamfile& anag = _nditte->lfile(LF_ANAG);
@@ -173,12 +168,8 @@ int TStampa_deleghe_IVA::select()
       }  
     }
   }
-<<<<<<< cg1400.cpp
   end_wait();
-=======
-  end_wait();
-  
->>>>>>> 1.9
+
   int res = 1;     
   if (_ditte->items() > 0)
   {