From 2e3b19ebb26dc1ecf39cef5b21172b275821d507 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 18 Feb 2025 20:11:02 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/patches.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 319691aa93b..cb10fcce1c4 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -392,8 +392,5 @@ erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect erpnext.patches.v15_0.sync_auto_reconcile_config execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment") erpnext.patches.v14_0.disable_add_row_in_gross_profit -<<<<<<< HEAD erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment -======= erpnext.patches.v14_0.update_posting_datetime ->>>>>>> ac9e5c0163 (fix: millisecond issue for posting datetime)