From 87fbbcffe52174ef338fde83f0e2774d77b7f57c Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Sat, 15 Aug 2026 19:42:06 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/setup/doctype/email_digest/email_digest.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index e114e3fe021..4ad544696b3 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -903,14 +903,6 @@ def send():
 			ed_obj.send()
 
 
-<<<<<<< HEAD
-@frappe.whitelist()
-def get_digest_msg(name):
-	return frappe.get_doc("Email Digest", name).get_msg_html()
-
-
-=======
->>>>>>> 4cd8fbf1c0 (refactor(email_digest): convert `get_digest_msg` from module function to instance method (#58193))
 def get_incomes_expenses_for_period(account, from_date, to_date):
 	"""Get amounts for current and past periods"""