From 766f2e0f6d1317c079efd1a64e19c569f19b5ebe Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Wed, 31 Jan 2024 10:42:24 -0600 Subject: [PATCH] -... --- B4A/Durakelo.b4a | 2 ++ B4A/Durakelo.b4a.meta | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index e23e34d..dd6be99 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -825,6 +825,8 @@ Sub Activity_Create(FirstTime As Boolean) pm.Initialize(Activity) End Sub + + 'Template version: B4A-1.01 #Region Delegates diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 0d681d2..5de1a9e 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -70,10 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -<<<<<<< .mine -NavigationStack=Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B4XPage_Appear,204,6,Starter,Timer1_Tick,67,0,Starter,ENVIA_ULTIMA_GPS,91,0,Starter,Process_Globals,20,0,C_Productos,Class_Globals,0,0,C_Principal,trabajar_Click,437,0,C_Principal,connecta_Click,1957,0,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,438,0,C_Cliente,B_VENTA_Click,1230,0 -======= -NavigationStack=C_Cliente,Class_Globals,145,0,C_Principal,cargar_Click,958,0,C_Cliente,B_INV_Click,1117,0,C_Cliente,GPS_LocationChanged,362,0,C_Cliente,gest_Click,434,0,C_Cliente,B_VENTA_Click,1226,0,C_Cliente,B_IMP2_Click,846,5,C_Cliente,initialize,149,0,C_Cliente,Printer1_Connected,1344,1,C_Cliente,B_EXIBI_Click,1322,0 ->>>>>>> .theirs +NavigationStack=Main,Activity_Create,32,0 SelectedBuild=0 -VisibleModules=21,2,9,18,7,10,22,11,23,4 +VisibleModules=1,2,3,4,5,6,7,8,9,10