Do

inter/tha/xml/multi/page_catalog.lxml

@@ -188,7 +188,7 @@
 	DEBUGVAR ShowButtonClick2
 
 	DEBUGVAR MenuKidButtonState
-
+	DEBUGVAR New_Payment
 	
 
 
@@ -196,7 +196,6 @@
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"
 
-<<<<<<< HEAD
 	Var ButtonLanguageCurrentXPosition = 1005
     Var ButtonLanguageCurrentYPosition = 458 - 38
 
@@ -206,16 +205,6 @@
 	Var SelectedMenu = ""
 	Var MultiProcess = "Invisible"
 
-=======
-	;for test!!!!!!!!!!!!!!!
-	If InternationalEnable = 1 Then
-		If CountryName = "Thailand" Then
-			Var ShowButtonClick2 = "Enable"
-			Var ButtontoTopupMenu = "Enable"
-		EndIf
-	EndIf
-
->>>>>>> 49b8be98be069a71ce86f2992d5e45783d60d100
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -740,8 +729,7 @@
 	Open CheckMemberPage
 	
 </EventClick>
-<<<<<<< HEAD
-=======
+
 <Language>
 	<ID> 002005 </ID>
 	<X> 20 </X>
@@ -750,7 +738,6 @@
 	<Height> 72 </Height>
 </Language>
 </Button>
->>>>>>> 49b8be98be069a71ce86f2992d5e45783d60d100
 
 <Button>
 <X> 696 </X>
@@ -941,11 +928,7 @@
 </EventUnitTest2>
 ; Initial for jump to page_brewing3.xml
 <EventUnitTest3>
-<<<<<<< HEAD
-	
-</EventUnitTest3>
 
-=======
 	;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml"
 
 	Open "ROOT/taobin_project/xml/page_check_member2.xml"
@@ -973,7 +956,5 @@
 
 	Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
 </EventUnitTest8>
->>>>>>> 49b8be98be069a71ce86f2992d5e45783d60d100
-
 
 </Popup>