chore: resolve conflicts

frappe · Nov 19, 2023 · 7b9afa4 · 7b9afa4
1 parent da27c0f
commit 7b9afa4
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
@@ -349,12 +349,6 @@ execute:frappe.db.set_single_value("Payment Reconciliation", "payment_limit", 50
 erpnext.patches.v14_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month
 erpnext.patches.v14_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based
 erpnext.patches.v14_0.add_default_for_repost_settings
-<<<<<<< HEAD
-=======
-erpnext.patches.v15_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month
-erpnext.patches.v15_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based
-erpnext.patches.v15_0.set_reserved_stock_in_bin
 erpnext.patches.v14_0.create_accounting_dimensions_in_supplier_quotation
->>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
 # below migration patch should always run last
 erpnext.patches.v14_0.migrate_gl_to_payment_ledger