fixed conflix readme

README.md

@@ -158,7 +158,6 @@ For CloseCashierCustomisePdf in lookups
 	1) settings/print_settings
   	2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 }
 
-<<<<<<< HEAD
 <---- Extra Fields Script -----> 
 For MoveTablePdf in lookups 
     *** Both Table and Room Moving ***
@@ -170,13 +169,12 @@ For MoveTablePdf in print settings
 	ii) Unique Code: MoveTablePdf 
 	iii)Template: ... 
 	iv) Font: Zawgyi-One v) Printer: #printer name   	
-=======
+
 /* Tax Profile Group Types in lookups */
 1) settings/lookups => { type:tax_profiles, name: Cashier, value:cashier }
 2) settings/lookups => { type:tax_profiles, name: Quick Service, value: quick_service }
 3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
 /* Tax Profile Group Types in lookups */
->>>>>>> 1c13b0469758fb968c0dfcc1f0a876ed2c5e395a
 
 Add Kitchen Role of  Employee 
    => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }