cheveguerra/Kelloggs_V3
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Kelloggs_V3.git synced 2026-04-20 14:19:23 +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