From aea169d4d47df960c1ed3329ddc59cfa462e1f53 Mon Sep 17 00:00:00 2001
From: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Date: Fri, 24 Nov 2023 15:30:19 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/accounts/utils.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index c78c8944db3..2836056b0c9 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -179,11 +179,7 @@ def get_balance_on(
 	in_account_currency=True,
 	cost_center=None,
 	ignore_account_permission=False,
-<<<<<<< HEAD
-=======
-	account_type=None,
 	start_date=None,
->>>>>>> 52305e3000 (fix: annual income and expenses in digest)
 ):
 	if not account and frappe.form_dict.get("account"):
 		account = frappe.form_dict.get("account")