chore: fix conflicts

erpnext/stock/doctype/quality_inspection/test_quality_inspection.py

@@ -216,42 +216,6 @@ class TestQualityInspection(FrappeTestCase):
 		qa.save()
 		self.assertEqual(qa.status, "Accepted")
 
-<<<<<<< HEAD
-=======
-	@change_settings("System Settings", {"number_format": "#.###,##"})
-	def test_diff_number_format(self):
-		self.assertEqual(frappe.db.get_default("number_format"), "#.###,##")  # sanity check
-
-		# Test QI based on acceptance values (Non formula)
-		dn = create_delivery_note(item_code="_Test Item with QA", do_not_submit=True)
-		readings = [
-			{
-				"specification": "Iron Content",  # numeric reading
-				"min_value": 60,
-				"max_value": 100,
-				"reading_1": "70,000",
-			},
-			{
-				"specification": "Iron Content",  # numeric reading
-				"min_value": 60,
-				"max_value": 100,
-				"reading_1": "1.100,00",
-			},
-		]
-
-		qa = create_quality_inspection(
-			reference_type="Delivery Note", reference_name=dn.name, readings=readings, do_not_save=True
-		)
-
-		qa.save()
-
-		# status must be auto set as per formula
-		self.assertEqual(qa.readings[0].status, "Accepted")
-		self.assertEqual(qa.readings[1].status, "Rejected")
-
-		qa.delete()
-		dn.delete()
-
 	def test_delete_quality_inspection_linked_with_stock_entry(self):
 		item_code = create_item("_Test Cicuular Dependecy Item with QA").name
 
@@ -279,7 +243,6 @@ class TestQualityInspection(FrappeTestCase):
 
 		se.delete()
 
->>>>>>> 7cc324e31e (fix: circular dependency error while deleting QC)
 
 def create_quality_inspection(**args):
 	args = frappe._dict(args)