From 1c1e4fa30b0df8c1110f16e6be314a161d370611 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Thu, 17 Oct 2024 10:11:27 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../doctype/purchase_order/purchase_order.js  | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index d108bd874d1..2fbc7e88559 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -218,17 +218,8 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 			}
 			if(doc.status != "Closed") {
 				if (doc.status != "On Hold") {
-<<<<<<< HEAD
 					if(flt(doc.per_received) < 100 && allow_receipt) {
 						cur_frm.add_custom_button(__('Purchase Receipt'), this.make_purchase_receipt, __('Create'));
-=======
-					if (flt(doc.per_received) < 100 && allow_receipt) {
-						cur_frm.add_custom_button(
-							__("Purchase Receipt"),
-							this.make_purchase_receipt,
-							__("Create")
-						);
->>>>>>> a33d5535a7 (fix: list view and form status not same for purchase order (backport #43690) (#43692))
 						if (doc.is_subcontracted) {
 							if (doc.is_old_subcontracting_flow) {
 								if (me.has_unsupplied_items()) {
@@ -240,18 +231,9 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 							}
 						}
 					}
-<<<<<<< HEAD
 					if(flt(doc.per_billed) < 100)
 						cur_frm.add_custom_button(__('Purchase Invoice'),
 							this.make_purchase_invoice, __('Create'));
-=======
-					if (flt(doc.per_billed) < 100)
-						cur_frm.add_custom_button(
-							__("Purchase Invoice"),
-							this.make_purchase_invoice,
-							__("Create")
-						);
->>>>>>> a33d5535a7 (fix: list view and form status not same for purchase order (backport #43690) (#43692))
 
 					if(flt(doc.per_billed) < 100 && doc.status != "Delivered") {
 						this.frm.add_custom_button(
@@ -600,4 +582,4 @@ frappe.ui.form.on("Purchase Order", "is_subcontracted", function(frm) {
 	if (frm.doc.is_old_subcontracting_flow) {
 		erpnext.buying.get_default_bom(frm);
 	}
-});
\ No newline at end of file
+});