From 075c547184daa2754e2a64a9f45a68cec3f3c39e Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Tue, 31 Jan 2023 16:14:45 +0530 Subject: [PATCH] chore: conflicts --- erpnext/patches.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index d9734c90fe4..54957cd2228 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -325,8 +325,5 @@ erpnext.patches.v14_0.setup_clear_repost_logs erpnext.patches.v14_0.create_accounting_dimensions_for_payment_request erpnext.patches.v14_0.update_entry_type_for_journal_entry erpnext.patches.v14_0.change_autoname_for_tax_withheld_vouchers -<<<<<<< HEAD erpnext.patches.v14_0.update_asset_value_for_manual_depr_entries -======= -erpnext.patches.v14_0.set_pick_list_status ->>>>>>> be41052dc8 (chore: add `status` field in `Pick List`) +erpnext.patches.v14_0.set_pick_list_status \ No newline at end of file