From 6cdc7811b889dbba638873dc2b80bac0401433df Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:42:00 +0530
Subject: [PATCH] fix: resolved conflicts

---
 erpnext/assets/doctype/asset_repair/test_asset_repair.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
index c7bad5ee2ed..307faa41a1b 100644
--- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -4,11 +4,7 @@
 import unittest
 
 import frappe
-<<<<<<< HEAD
-from frappe.utils import flt, nowdate
-=======
-from frappe.utils import add_days, add_months, flt, get_first_day, nowdate, nowtime, today
->>>>>>> 5a82b723c2 (fix: post gl entry on completion date of asset repair)
+from frappe.utils import add_days, flt, nowdate
 
 from erpnext.assets.doctype.asset.asset import (
 	get_asset_account,