From f6c3f5c4cbcb6484036d7560c622dec0dd6233e8 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Wed, 29 Apr 2026 01:24:14 +0530 Subject: [PATCH] chore: removed conflicts --- erpnext/setup/doctype/email_digest/test_email_digest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/setup/doctype/email_digest/test_email_digest.py b/erpnext/setup/doctype/email_digest/test_email_digest.py index f955748a02b..6caa66160b3 100644 --- a/erpnext/setup/doctype/email_digest/test_email_digest.py +++ b/erpnext/setup/doctype/email_digest/test_email_digest.py @@ -77,4 +77,3 @@ def create_email_digest(**args): doc.insert() return doc ->>>>>>> a8030c9713 (fix: filter overdue purchase order items by company (#54099))