From e81b85b2413ec008487a20d8d2eed3143731e9eb Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:39:57 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/assets/doctype/asset/asset.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 455e0a0f146..f28860d325b 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -799,13 +799,6 @@ erpnext.asset.scrap_asset = function (frm) {
 				fieldtype: "Date",
 				reqd: 1,
 			},
-<<<<<<< HEAD
-			method: "erpnext.assets.doctype.asset.depreciation.scrap_asset",
-			callback: function (r) {
-				cur_frm.reload_doc();
-			},
-		});
-=======
 		],
 		size: "medium",
 		primary_action_label: "Submit",
@@ -822,7 +815,6 @@ erpnext.asset.scrap_asset = function (frm) {
 				},
 			});
 		},
->>>>>>> e07bc5af41 (feat: validating asset scrap date (#43093))
 	});
 	scrap_dialog.show();
 };