pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

fix Conflict merge

Browse source
This commit is contained in:
miggaze 2021-11-10 15:46:37 +07:00
commit cea1107abf
60 changed files with 4728 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_topping_select.xml
View file

@ -7,6 +7,12 @@
<EventOpen>
Var y_topping_bg = 912
If JXMLVersionInt > 356 Then
If ConfigNumer >= 380 Then
Open "ROOT/taobin_project/xml/page_topping_select3.xml"
EndIf
EndIf
If ConfigNumer > 360 Then
SAVELOG "Recipe have smoothies"
Open "ROOT/taobin_project/xml/page_topping_select2.xml"