From 199e25ec063aecfbd95ec348b8c22834c7869720 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:20:48 +0530
Subject: [PATCH] fix: conflicts

---
 erpnext/assets/doctype/asset_repair/test_asset_repair.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
index 5fd00ccf36e..4cd304fbfd0 100644
--- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -4,12 +4,8 @@
 import unittest
 
 import frappe
-<<<<<<< HEAD
-=======
 from frappe import qb
 from frappe.query_builder.functions import Sum
-from frappe.tests import IntegrationTestCase
->>>>>>> bcf6deec9a (test: add unit test to validate capitalized asset repair gl entries being booked against the asset)
 from frappe.utils import add_days, add_months, flt, get_first_day, nowdate, nowtime, today
 
 from erpnext.assets.doctype.asset.asset import (