chore: resolve conflict

frappe · Oct 17, 2024 · 73d6f27 · 73d6f27
1 parent 35ae518
commit 73d6f27
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/hrms/hr/doctype/employee_advance/test_employee_advance.py b/hrms/hr/doctype/employee_advance/test_employee_advance.py
@@ -2,11 +2,8 @@
 # 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 import change_settings
 from frappe.utils import flt, nowdate
 
 import erpnext