From 983c55eca1ef34b5e2e84bc8f95976a6d9cadf8e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 16 May 2024 20:27:50 +0530 Subject: [PATCH] chore: Resolve conflicts --- erpnext/accounts/general_ledger.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 8b99226ba27..3f01dee888d 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -7,12 +7,7 @@ import copy import frappe from frappe import _ from frappe.model.meta import get_field_precision -<<<<<<< HEAD from frappe.utils import cint, cstr, flt, formatdate, getdate, now -======= -from frappe.utils import cint, flt, formatdate, getdate, now -from frappe.utils.dashboard import cache_source ->>>>>>> d56f52b0ba (feat: Config to enable immutable ledger) import erpnext from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (