From 45e25b2d56452d01334cc7ee53bcec05bf7b927f Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 20 Jul 2022 19:01:14 +0530 Subject: [PATCH] chore: do not re run patch (cherry picked from commit cad2035e07ea332e59cdd4707586435536a54666) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index f77ad02c95f..44c66c6f527 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -368,8 +368,12 @@ erpnext.patches.v13_0.create_accounting_dimensions_in_orders ======= erpnext.patches.v14_0.discount_accounting_separation erpnext.patches.v14_0.delete_employee_transfer_property_doctype +<<<<<<< HEAD erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1 >>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders) +======= +erpnext.patches.v13_0.create_accounting_dimensions_in_orders +>>>>>>> cad2035e07 (chore: do not re run patch) erpnext.patches.v13_0.set_per_billed_in_return_delivery_note erpnext.patches.v13_0.update_employee_advance_status erpnext.patches.v13_0.job_card_status_on_hold