chore: conflicts

erpnext/stock/doctype/pick_list/pick_list.py

@@ -96,16 +96,9 @@ def update_sales_order_item(self, item, picked_qty, item_code):
 				100 + flt(frappe.db.get_single_value("Stock Settings", "over_delivery_receipt_allowance"))
 			):
 				frappe.throw(
-<<<<<<< HEAD
-					"You are picking more than required quantity for "
-					+ item_code
-					+ ". Check if there is any other pick list created for "
-					+ so_doc.name
-=======
 					_(
 						"You are picking more than required quantity for {}. Check if there is any other pick list created for {}"
 					).format(item_code, item.sales_order)
->>>>>>> e64cc66df7 (refactor: sales order status update)
 				)
 
 		frappe.db.set_value(item_table, item.sales_order_item, "picked_qty", already_picked + picked_qty)

erpnext/stock/doctype/pick_list/test_pick_list.py

@@ -5,17 +5,10 @@
 from frappe import _dict
 from frappe.tests.utils import FrappeTestCase
 
-<<<<<<< HEAD
-from erpnext.stock.doctype.item.test_item import create_item
-=======
 from erpnext.selling.doctype.sales_order.sales_order import create_pick_list
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.stock.doctype.item.test_item import create_item, make_item
-<<<<<<< HEAD
->>>>>>> 7d5682020a (test: bundles in picklist)
-=======
 from erpnext.stock.doctype.packed_item.test_packed_item import create_product_bundle
->>>>>>> 9e60acdf56 (test: test bundle - picklist behaviour)
 from erpnext.stock.doctype.pick_list.pick_list import create_delivery_note
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry