From 65f7e9c9ad33a95eb1e0f249f192e06435dac462 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 10 Jul 2026 10:42:16 +0530 Subject: [PATCH] chore: fix conflicts Removed merge conflict markers and cleaned up code. --- .../stock_and_account_value_comparison.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py index 50de2af1875..23d20dae9da 100644 --- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py +++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py @@ -219,8 +219,6 @@ def create_reposting_entries(rows, company): if entries: entries = ", ".join(entries) frappe.msgprint(_("Reposting entries created: {0}").format(entries)) -<<<<<<< HEAD -======= def repost_based_on_transaction(rows, company=None, entries=None): @@ -264,4 +262,3 @@ def repost_based_on_transaction(rows, company=None, entries=None): entries.append(get_link_to_form("Repost Item Valuation", doc.name)) except frappe.DuplicateEntryError: frappe.db.rollback(save_point="repost_based_on_transaction") ->>>>>>> adae0bd732 (feat: weekly auto-repost of incorrect stock valuation entries (#56637))