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

DO

Browse source
This commit is contained in:
kong 2022-10-13 23:19:45 +07:00
parent a62a2adc5e
commit e47c36d4de
6 changed files with 4288 additions and 2078 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spiral/xml/page_catalog_vending_machine.xml
View file

@ -42,11 +42,6 @@
EndIf
<<<<<<< HEAD
=======
>>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
; SpiralOnline
Var MenuVSelected2 = "Invisible"
@ -65,15 +60,9 @@
Var MenuVSelected2 = "Invisible"
If SpiralOnline = "true" Then
<<<<<<< HEAD
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
EndIf
=======
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
EndIf
>>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
EndIf
; init default
@ -230,11 +219,7 @@
;
<<<<<<< HEAD
;
=======
>>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
<ListView1>
<Width> 1080 </Width>
<Height> "auto" </Height>