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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-10-17 10:03:07 +07:00
commit 457f891071
24 changed files with 34 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xml/page_NewBrewing3.xml
View file

@ -17,17 +17,11 @@
SAVELOG "page_Newbrewing3.xml version 2"
DEBUGVAR MachineStage
<<<<<<< HEAD
DEBUGVAR Seeker.ORDER_ID
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
=======
DEBUGVAR Seeker.ORDER_ID
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
>>>>>>> a27f8c94eb6df022194c4c644404ecfa103696c4
Var PictureFileTextDesctionState = "Enable"