From 144f06e3819916c3ab62f23e460fac72e91f45d5 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 1 Sep 2014 18:31:11 +0530 Subject: [PATCH] Update patches.txt --- erpnext/patches.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index cde43f347e..9146336fd5 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -78,8 +78,5 @@ erpnext.patches.v4_2.update_project_milestones erpnext.patches.v4_2.add_currency_turkish_lira #2014-08-08 execute:frappe.delete_doc("DocType", "Landed Cost Wizard") erpnext.patches.v4_2.default_website_style -<<<<<<< HEAD erpnext.patches.v4_2.set_company_country -======= erpnext.patches.v4_2.update_sales_order_invoice_field_name ->>>>>>> Add patch for field name change in SI, rename email template