From aa29c5dde2a92a25f8c584924ee65a19f9dc7e9c Mon Sep 17 00:00:00 2001
From: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
Date: Tue, 10 Jun 2025 13:05:37 +0530
Subject: [PATCH] fix: conflicts

---
 erpnext/stock/utils.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 9710321d075..637d56f093a 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -109,11 +109,8 @@ def get_stock_balance(
 
 	from erpnext.stock.stock_ledger import get_previous_sle
 
-<<<<<<< HEAD
-=======
 	frappe.has_permission("Item", "read", throw=True)
 
->>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976))
 	if posting_date is None:
 		posting_date = nowdate()
 	if posting_time is None: