fix: conflicts test_sales_invoice.py

earthians · Dec 17, 2024 · 0516675 · 0516675
1 parent ce42338
commit 0516675
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/healthcare/healthcare/custom_doctype/test_sales_invoice.py b/healthcare/healthcare/custom_doctype/test_sales_invoice.py
@@ -1,18 +1,12 @@
 import frappe
 from frappe.tests.utils import FrappeTestCase
 
-test_records = frappe.get_test_records("Sales Invoice")
-
 EXTRA_TEST_RECORD_DEPENDENCIES = ["Sales Invoice"]
 
 
 class TestSalesInvoice(FrappeTestCase):
 	def test_set_healthcare_services_should_preserve_state(self):
-<<<<<<< HEAD
-		invoice = frappe.copy_doc(test_records[0])
-=======
 		invoice = frappe.copy_doc(self.globalTestRecords["Sales Invoice"][0])
->>>>>>> ce21bc0 (test: sales invoice override - use globalTestRecords)
 
 		count = len(invoice.items)
 		item = invoice.items[0]