cheveguerra/Mariana
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Mariana.git synced 2026-04-20 06:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	B4A/Mariana.b4a.meta
This commit is contained in:
cvaldes1201
2023-10-24 10:09:02 -06:00
parent f0a06a092d 0a89a37668
commit acb76e9a76
473 changed files with 1045 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
B4A/Mariana.b4a.meta
View File

@@ -18,6 +18,7 @@ ModuleBookmarks23=
ModuleBookmarks24=
ModuleBookmarks25=
ModuleBookmarks26=
ModuleBookmarks27=
ModuleBookmarks3=
ModuleBookmarks4=
ModuleBookmarks5=
@@ -45,6 +46,7 @@ ModuleBreakpoints23=
ModuleBreakpoints24=
ModuleBreakpoints25=
ModuleBreakpoints26=
ModuleBreakpoints27=
ModuleBreakpoints3=
ModuleBreakpoints4=
ModuleBreakpoints5=
@@ -55,10 +57,10 @@ ModuleBreakpoints9=
ModuleClosedNodes0=
ModuleClosedNodes1=
ModuleClosedNodes10=
ModuleClosedNodes11=
ModuleClosedNodes11=1
ModuleClosedNodes12=
ModuleClosedNodes13=
ModuleClosedNodes14=
ModuleClosedNodes13=1
ModuleClosedNodes14=2
ModuleClosedNodes15=
ModuleClosedNodes16=
ModuleClosedNodes17=
@@ -72,13 +74,18 @@ ModuleClosedNodes23=
ModuleClosedNodes24=
ModuleClosedNodes25=
ModuleClosedNodes26=
ModuleClosedNodes27=
ModuleClosedNodes3=
ModuleClosedNodes4=
ModuleClosedNodes4=2
ModuleClosedNodes5=
ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes9=
<<<<<<< HEAD
NavigationStack=B4XMainPage,B_SERVER_Click,704,0,B4XMainPage,lv_server_ItemClick,719,0,B4XMainPage,CheckNotificationAccess,744,0,B4XMainPage,b_envioBD_Click,743,0,B4XMainPage,B4XPage_Appear,307,0,NotificationService,NotiMon_NotificationPosted,40,0,NotificationService,Service_Destroy,29,0,NotificationService,Service_Start,22,0,C_Principal,Subir_Click,633,0,Subs,traeMaxPromos,975,0,Subs,alcanzanLosVariablesParaPromo,954,0
=======
NavigationStack=B4XMainPage,b_envioBD_Click,743,0,Visual Designer,principal.bal,-100,5,FileHandler,Class_Globals,13,0,FileHandler,Initialize,24,0,B4XMainPage,B4XPage_Created,135,6,B4XMainPage,Class_Globals,88,0,B4XMainPage,b_importarBD_Click,770,0,B4XMainPage,CheckNotificationAccess,761,0,Visual Designer,login.bal,-100,6,B4XMainPage,i_engrane_Click,701,6
>>>>>>> 0a89a37668b0333c8b54d028f163148c7f807f0c
SelectedBuild=0
VisibleModules=2,12,24,23,16,25,15,13,6,8
VisibleModules=2,12,25,16,26,5,4,6,7,8