Merge
This commit is contained in:
parent
ff2c8e7b49
commit
256eb9e6d0
1 changed files with 0 additions and 4 deletions
|
|
@ -530,11 +530,7 @@
|
|||
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
;Var Timeout = 0
|
||||
EndIf
|
||||
<<<<<<< HEAD
|
||||
If Seeker = "curr" Then
|
||||
=======
|
||||
If PauseOrder = "false" Then
|
||||
>>>>>>> 0479282586527f47f0f2821824b32af59e613c53
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue