This commit is contained in:
2023-11-22 10:48:29 -06:00
parent 3f6fd5e948
commit a493660b38
2 changed files with 488 additions and 503 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -48,7 +48,7 @@ ModuleBreakpoints6=
ModuleBreakpoints7=
ModuleBreakpoints8=
ModuleBreakpoints9=
ModuleClosedNodes0=11,13,14,15,16,17
ModuleClosedNodes0=2,3
ModuleClosedNodes1=
ModuleClosedNodes10=
ModuleClosedNodes11=5,6,7,10
@@ -72,22 +72,7 @@ ModuleClosedNodes5=2,3,6,7,8,9
ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes21=
ModuleClosedNodes22=
ModuleClosedNodes23=
ModuleClosedNodes24=
ModuleClosedNodes3=
ModuleClosedNodes4=
ModuleClosedNodes5=2,3,6,7,8,9
ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
<<<<<<< .mine
ModuleClosedNodes9=2,5,6,8,10,11,12,13,24,36,37
NavigationStack=Starter,ENVIA_ULTIMA_GPS,98,0,fila,B_IMP_Click,699,0,colonia2,HACER_PEDIDO,455,0,seleccion,Globals,164,0,seleccion,IsConnectedToInternet,266,0,seleccion,Activity_Create,184,6,Visual Designer,seleccion.bal,-100,4,Visual Designer,mapa_rutas.bal,-100,3,MAPA_RUTAS,Process_Globals,15,0,MAPA_RUTAS,Globals,16,0,MAPA_RUTAS,Activity_Create,98,6
=======
ModuleClosedNodes9=2,5,6,8,10,11,12,13,22,24,36,37
NavigationStack=seleccion,connecta_Click,2009,0,MAPA_RUTAS,MapFragment1_Ready,135,0,DBRequestManager,Initialize,20,0,DBRequestManager,PrintTable,267,0,DBRequestManager,Class_Globals,12,0,seleccion,Subir_Click,862,0,seleccion,JobDone,1105,6,seleccion,cargar_Click,900,5,Diseñador Visual,login.bal,-100,3,Main,Process_Globals,29,0
>>>>>>> .theirs
NavigationStack=Starter,ENVIA_ULTIMA_GPS,98,0,fila,B_IMP_Click,699,0,colonia2,HACER_PEDIDO,455,0,seleccion,Globals,164,0,seleccion,IsConnectedToInternet,266,0,seleccion,Activity_Create,184,6,Visual Designer,seleccion.bal,-100,4,Visual Designer,mapa_rutas.bal,-100,3,MAPA_RUTAS,Process_Globals,15,0,MAPA_RUTAS,Globals,16,0,MAPA_RUTAS,Activity_Create,86,6
SelectedBuild=0
VisibleModules=21,20,24,14