chore: resolved conflicts

2025-06-30 01:04:54 +05:30
parent f31b008502
commit 2b37287b19
1 changed files with 0 additions and 5 deletions
--- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -4,12 +4,7 @@
 import unittest

 import frappe
-<<<<<<< HEAD
-from frappe.utils import flt, nowdate, nowtime, today
-=======
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, flt, get_first_day, nowdate, nowtime, today
->>>>>>> cfe04a2aaf (test: asset status validation)

 from erpnext.assets.doctype.asset.asset import (
 	get_asset_account,