fix(xml): merge conflic
This commit is contained in:
parent
5269f48101
commit
899db59317
1 changed files with 16 additions and 18 deletions
|
|
@ -293,7 +293,6 @@
|
|||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
|
|
@ -303,7 +302,6 @@
|
|||
Var MachineErrorDetailAll = " Please take a cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue