fix conflict
This commit is contained in:
commit
1aa230bc9f
313 changed files with 104942 additions and 5139 deletions
|
|
@ -6,11 +6,22 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
|
||||
|
||||
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"
|
||||
DEBUGVAR Brewing3ContiXMLFile
|
||||
|
||||
Open Brewing3ContiXMLFile
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var ActionOKCase = 0
|
||||
Var Seeker = "curr"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue