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

resolve some conflict

Browse source
This commit is contained in:
Kenta420 2024-08-23 16:51:17 +07:00
parent 79b4664278
commit 097b645331
3 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inter/uae_dubai/video/script_video.ev
View file

@ -3,11 +3,10 @@ Var EventTurnOn = 0
<<<<<<< HEAD
DEBUGVAR EventTurnOn DEBUGVAR EventTurnOn
Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4" Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
=======
DEBUGVAR MainfileSize DEBUGVAR MainfileSize
If SystemDateMonthInt = 12 Then If SystemDateMonthInt = 12 Then
GetFileSizeK "taobin_project/inter/common/video/video_main_event.mp4" MainfileSize GetFileSizeK "taobin_project/inter/common/video/video_main_event.mp4" MainfileSize
@ -40,4 +39,3 @@ Else
Var ShowButtonClickFull = "Invisible" Var ShowButtonClickFull = "Invisible"
Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4" Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
EndIf EndIf
>>>>>>> a57ecc08db5486e3f26fe455f2d0e34aa480dd30

3
xml/page_catalog_group_pro_robinson_beauty.skt
View file

@ -14,10 +14,7 @@
Var Timeout = 0 Var Timeout = 0
<<<<<<< HEAD
=======
Var FromRobinsonBeautyPro = 0 Var FromRobinsonBeautyPro = 0
>>>>>>> d60c9e3869794302ccb03e1d7b65f6e600a7b226
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml" ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"

3
xml/page_catalog_group_pro_robinson_beauty.xml
View file

@ -12,10 +12,7 @@
Var Timeout = 0 Var Timeout = 0
<<<<<<< HEAD
=======
Var FromRobinsonBeautyPro = 0 Var FromRobinsonBeautyPro = 0
>>>>>>> d60c9e3869794302ccb03e1d7b65f6e600a7b226
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml" ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"