Merge and remvoe move promotion_mystery_cup_35
This commit is contained in:
parent
0e00048943
commit
2ce4e71a81
6 changed files with 25 additions and 10716 deletions
|
|
@ -61,17 +61,9 @@
|
|||
Else
|
||||
Var DirImage = "ROOT/taobin_project/image/complete/"
|
||||
EndIf
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
Var text_bottom = DirImage + "text_bottom.png"
|
||||
=======
|
||||
|
||||
If LanguageShow = "UAE_DUBAI" Then
|
||||
|
||||
Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png"
|
||||
|
||||
Else
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If LanguageShow = "UAE_DUBAI" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue