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

THAI: Fixed merge conflic

Browse source
This commit is contained in:
Kenta420 2025-05-08 18:14:51 +07:00
parent f1bc6cd492
commit 707dc7ea49
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
inter/tha/configure.ev
View file

@ -30,19 +30,14 @@
Var EnableMultiInstanceFromBoxID = 1 Var EnableMultiInstanceFromBoxID = 1
EndIf EndIf
<<<<<<< HEAD
If BoxID = 210699 Then If BoxID = 210699 Then
Var EnableMultiInstanceFromBoxID = 1 Var EnableMultiInstanceFromBoxID = 1
EndIf EndIf
=======
If BoxID = 174565 Then If BoxID = 174565 Then
Var EnableMultiInstanceFromBoxID = 1 Var EnableMultiInstanceFromBoxID = 1
EndIf EndIf
If BoxID = 173319 Then If BoxID = 173319 Then
Var EnableMultiInstanceFromBoxID = 0 Var EnableMultiInstanceFromBoxID = 0
EndIf EndIf
>>>>>>> 6467e5f893ec61fc1c783c5b4e790ea2d74d664c