fix HEAD

xml/page_catalog_group_pro_oreo_11_fixed.xml

@@ -3401,13 +3401,8 @@ Sugar, Oreo" </Value>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick>
 		Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE"
-<<<<<<< HEAD
 		Var NameDrinkTH = "ชานมขิงโอริโอ้ปั่น"
 		Var DrinkDescriptionTH = "ขิง นม น้ำตาล   Oreo"
-=======
-		Var NameDrinkTH = "ชานมขิงโอรีโอปั่น"
-		Var DrinkDescriptionTH = "ขิง นม น้ำตาล  โอรีโอ"
->>>>>>> 60d7978f96f90bf627023963827e19d9b7d9a52a
 		Var DrinkDescription = "Ginger, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11"
 		Var PictureDrink = PictureDrink + Extension

xml/page_thankyouConti.xml

@@ -59,11 +59,11 @@
 	;DEBUGVAR LidState
 	DEBUGVAR BottomText
 
-	;If StarwState = "Press" Then
+	;I f StarwState = "Press" Then
 	;	Machine StrawWithDelay
 	;	LED LedDoorLid Blink 255 255 255 255
 	;EndIf
-	;If LidState = "Press" Then
+	;I f LidState = "Press" Then
 	;	Machine LidWithDelay
 	;	LED LedDoorLid Blink 255 255 255 255
 	;EndIf
@@ -293,25 +293,20 @@
 		Else
 			Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
 		EndIf
-<<<<<<< HEAD
-	Else
-=======
+
 		If LanguageShow = "MYANMAR" Then 
 			Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
 		EndIf
 	Else 
->>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
 		If CupChecking = "true" Then
 			If show_eng = "true" Then
 				Var MachineErrorDetailAll = " Please take a cup."
 			Else
 				Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
-<<<<<<< HEAD
-=======
+
 			EndIf 
 			If LanguageShow = "MYANMAR" Then 
 				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
->>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
 			EndIf
 		Else
 			If show_eng = "true" Then