Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
ce80902ee8
10 changed files with 7 additions and 12 deletions
|
|
@ -8,18 +8,18 @@
|
|||
If BoxID = 105005 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
|
||||
If BoxID = 176277 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
If BoxID = 200435 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
|
||||
If BoxID = 201316 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
|
@ -30,19 +30,14 @@
|
|||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
<<<<<<< HEAD
|
||||
If BoxID = 210699 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
|
||||
=======
|
||||
If BoxID = 174565 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If BoxID = 173319 Then
|
||||
Var EnableMultiInstanceFromBoxID = 0
|
||||
EndIf
|
||||
>>>>>>> 6467e5f893ec61fc1c783c5b4e790ea2d74d664c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue