From 7d593dd3db06eb66ed9eea083092400d2f32d07b Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Thu, 6 Nov 2025 00:51:41 +0530
Subject: [PATCH] fix: resolve conflict

---
 .../asset_depreciation_ledger/asset_depreciation_ledger.py  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
index 891a06d4a0c..b23051bd79c 100644
--- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
@@ -119,12 +119,8 @@ def get_assets_details(assets):
 
 	fields = [
 		"name as asset",
-<<<<<<< HEAD
-		"gross_purchase_amount",
-=======
 		"asset_name",
-		"net_purchase_amount",
->>>>>>> f3eda02972 (feat: add asset name column)
+		"gross_purchase_amount",
 		"opening_accumulated_depreciation",
 		"asset_category",
 		"status",