mirror of
https://github.com/KeymonSoft/Durakelo.git
synced 2026-04-17 19:36:12 +00:00
-...
This commit is contained in:
@@ -825,6 +825,8 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
pm.Initialize(Activity)
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
'Template version: B4A-1.01
|
||||
#Region Delegates
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user