cheveguerra/Durakelo_Reparto
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Durakelo_Reparto.git synced 2026-04-22 13:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KeymonSoft/Durakelo_Reparto

Browse Source 
# Conflicts:
#	Durakelo_reparto.b4a.meta
This commit is contained in:
cvaldes1201
2023-11-20 08:42:28 -06:00
parent a1b9b5056a 8fcae35050
commit 8813421939
16 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Durakelo_reparto.b4a.meta
View File

@@ -64,6 +64,10 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=3,6,8,17,18,19
ModuleClosedNodes9=
<<<<<<< HEAD
NavigationStack=seleccion,JobDone,626,6,Main,Activity_Create,58,0,Starter,pe_BatteryChanged,43,0,colonia,Activity_Resume,64,5,colonia,ListView1_ItemClick,141,2,colonia,BUSCA_TextChanged,195,2,Diseñador Visual,fila.bal,-100,2,Main,Process_Globals,30,0,Starter,ENVIA_ULTIMA_GPS,62,0,seleccion,cargar_Click,535,6
=======
NavigationStack=Visual Designer,login.bal,-100,1,Visual Designer,mapa.bal,-100,2,Visual Designer,mapa_rutas.bal,-100,1,Visual Designer,nopago.bal,-100,2,Visual Designer,nuevocliente.bal,-100,2,Visual Designer,pedido.bal,-100,2,Visual Designer,seleccion.bal,-100,1,Visual Designer,tarjeta.bal,-100,2,Visual Designer,telefonos.bal,-100,1,seleccion,JobDone,935,6
>>>>>>> 8fcae350507f27b4d1f396c01e70a8aad755cd6c
SelectedBuild=0
VisibleModules=18,21,10,9,12,8,4,14,11,2,17
VisibleModules=18,21,4,17,6