cheveguerra/Kelloggs_V3
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Kelloggs_V3.git synced 2026-04-17 21:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/KeymonSoft/Kelloggs_V3

Browse Source 
# Conflicts:
#	B4A/B4XMainPage.bas
#	B4A/KelloggsV3.b4a.meta
This commit is contained in:
cvaldes1201
2023-10-27 12:43:32 -06:00
parent abd651a342 a30093ba05
commit 48c90118c9
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
B4A/B4XMainPage.bas
View File

@@ -21,6 +21,7 @@ Version=9.85
#End Region
<<<<<<< HEAD
'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
@@ -33,6 +34,8 @@ Version=9.85
=======
>>>>>>> a30093ba05c3ba171d9ac3b4164b9ca5f7234d86
Sub Class_Globals
Private Root As B4XView
Private xui As XUI

4
B4A/KelloggsV3.b4a.meta
View File

@@ -82,6 +82,10 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes9=
<<<<<<< HEAD
NavigationStack=C_NoVenta,Class_Globals,0,0,C_Clientes,Class_Globals,0,0,C_Nota,ListView1_ItemLongClick,320,0,C_Nota,b_desc_Click,353,0,C_Cliente,Class_Globals,290,6,C_Cliente,B4XPage_Appear,428,6,C_Cliente,B_IMP2_Click,1295,6,C_Nota,Class_Globals,34,0,C_Nota,B4XPage_Appear,179,0,C_TicketsDia,Class_Globals,8,0,C_TicketsDia,B4XPage_Appear,70,2
=======
NavigationStack=C_Cliente,Mods,0,0,C_Cliente,Class_Globals,290,0,C_Cliente,B4XPage_Appear,429,0,C_Cliente,B_IMP2_Click,1297,0,C_Nota,Class_Globals,34,0,C_Nota,B4XPage_Appear,179,0,C_TicketsDia,Class_Globals,8,0,C_TicketsDia,B4XPage_Appear,69,2
>>>>>>> a30093ba05c3ba171d9ac3b4164b9ca5f7234d86
SelectedBuild=0
VisibleModules=1,2,3,4,5,6,7,8,9,10,14,11