From dee6e2b6977f8ba82fc34d0a453f99e5f58fc785 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 31 Jan 2025 10:38:08 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/report/stock_ledger/stock_ledger.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index 13f546d950b..4341feec985 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -4,13 +4,8 @@ import frappe from frappe import _ -<<<<<<< HEAD from frappe.query_builder.functions import CombineDatetime -from frappe.utils import cint, flt -======= -from frappe.query_builder.functions import CombineDatetime, Sum from frappe.utils import cint, flt, get_datetime ->>>>>>> e61ab48145 (fix: posting_date to posting_datetime in stock related queries) from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos