resolve conflit

This commit is contained in:
Thinzar Win
2020-10-14 21:46:35 +06:30
75 changed files with 2002 additions and 450 deletions

View File

@@ -384,11 +384,15 @@
"invoice.box.cargo_type": "Cargo types",
"invoice.cargo_type":"Cargo types",
"invoice.box.number":"Carton number",
"invoice.box.length":"Length",
"invoice.box.width":"Width",
"invoice.boc.height":"Height",
"invoice.box.length":"L",
"invoice.box.width":"W",
"invoice.boc.height":"H",
"invoice.discount_value": "Discount",
"invoice.net_amount":"Net Amount",
"invoice.customer_info":"Customer information",
"invoice.pdf": "Invoice PDF",
"invoice.total_custom_fee":"Total custom fee",
"invoice.shipment_weight":"Shipment weight",
"Invoices End ================================================================":"",
"Discount Start ================================================================":"",