Merge remote-tracking branch 'origin/HEAD'

2021-08-04 19:43:21 +02:00
parent c040baf75c 435fa8c0df
commit b36cb325f6
1 changed files with 4 additions and 0 deletions
@@ -140,7 +140,11 @@ local function CMP_Draw(bPreview)
   local SideNum =1
   
   -- **COSTRUZIONE DELLA TABELLA DEI LATI DEL LATI DEL COMPONENTE**
+<<<<<<< HEAD
   local SideTab = {}  
+=======
+   SideTab = {}  
+>>>>>>> origin/HEAD
   local CurrSide = EgtGetFirstInGroup( Lw) 
   local PrecSide = nil
   while CurrSide ~= nil do