fix conflict

This commit is contained in:
miggaze 2024-07-01 16:13:02 +07:00
commit 1aa230bc9f
313 changed files with 104942 additions and 5139 deletions

View file

@ -178,6 +178,7 @@
SAVELOG QRCODE99
DEBUGVAR QRCODE99
SAVELOG Seeker.VendingDiscount
SAVELOG VendingCampaign
SAVELOG Seeker.VendingCode
SAVELOG Seeker.CodeChannel