chore: resolve conflict

frappe · Oct 18, 2024 · 12774c0 · 12774c0
1 parent 35ae518
commit 12774c0
Showing 1 changed file with 1 addition and 5 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,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