Skip to content

Commit 163af91

Browse files
mihir-kandoimergify[bot]
authored andcommitted
fix: Removed patch as instructed by mentor
(cherry picked from commit d1d0148) # Conflicts: # erpnext/patches.txt
1 parent b3b8083 commit 163af91

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

erpnext/patches.txt

+4
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,11 @@ erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
387387
erpnext.patches.v15_0.enable_allow_existing_serial_no
388388
erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts
389389
<<<<<<< HEAD
390+
<<<<<<< HEAD
390391
=======
391392
erpnext.patches.v15_0.refactor_closing_stock_balance #5
392393
erpnext.subcontracting.doctype.subcontracting_order.patches.set_sc_conversion_factor
393394
>>>>>>> 65dc3505c4 (fix: Added patch and fallback code to prevent future issues similiar to helpdesk ticket 28246)
395+
=======
396+
erpnext.patches.v15_0.refactor_closing_stock_balance #5
397+
>>>>>>> d1d01482df (fix: Removed patch as instructed by mentor)

erpnext/subcontracting/doctype/subcontracting_order/patches/set_sc_conversion_factor.py

-26
This file was deleted.

0 commit comments

Comments
 (0)