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

merge conflict extendData

Browse source
This commit is contained in:
miggaze 2022-05-24 14:21:27 +07:00
parent 130ac15301
commit 7c15e0c9ec
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_cannotConti.xml
View file

@ -66,14 +66,9 @@
;Topping "Select3-ID" Seeker.topping3 ;Topping "Select3-ID" Seeker.topping3
; Pack ; Pack
<<<<<<< HEAD
; no change
; Topping "Pack" ExtendData
=======
Topping "Pack" ExtendDataCurr Topping "Pack" ExtendDataCurr
DEBUGVAR ExtendDataCurr DEBUGVAR ExtendDataCurr
Var Seeker.ExtendData = ExtendDataCurr Var Seeker.ExtendData = ExtendDataCurr
>>>>>>> 5e5a37195320147236c6a59c0b98defb59901dcb
Var ExtendData = Seeker.ExtendData Var ExtendData = Seeker.ExtendData