From a7a574237502446885e3a2e2c255920e4045dcd7 Mon Sep 17 00:00:00 2001 From: rahib-hassan Date: Mon, 11 Apr 2022 14:28:36 +0530 Subject: [PATCH] fix: merge conflict(patch) --- erpnext/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 24354c38423..46d6e93db55 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -364,4 +364,5 @@ erpnext.patches.v13_0.add_cost_center_in_loans erpnext.patches.v13_0.set_return_against_in_pos_invoice_references erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items # 24-03-2022 erpnext.patches.v13_0.update_expense_claim_status_for_paid_advances +erpnext.patches.v13_0.create_gst_custom_fields_in_quotation erpnext.patches.v14_0.discount_accounting_separation \ No newline at end of file