From 12774c030b6224aa51a050109150dd59f2c0bfbb Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Thu, 17 Oct 2024 20:06:38 +0530
Subject: [PATCH] chore: resolve conflict

---
 hrms/hr/doctype/employee_advance/test_employee_advance.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hrms/hr/doctype/employee_advance/test_employee_advance.py b/hrms/hr/doctype/employee_advance/test_employee_advance.py
index ee32eb7529..7e9de8db9a 100644
--- a/hrms/hr/doctype/employee_advance/test_employee_advance.py
+++ b/hrms/hr/doctype/employee_advance/test_employee_advance.py
@@ -2,11 +2,7 @@
 # See license.txt
 
 import frappe
-<<<<<<< HEAD
-from frappe.tests.utils import FrappeTestCase
-=======
-from frappe.tests import IntegrationTestCase, change_settings
->>>>>>> 3bbe0ceb2 (test: add unit test to unlink employee advance from payment entry)
+from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import flt, nowdate
 
 import erpnext