From 6846f02cea8bc2bbf12dcd36d3f946e45de87fd7 Mon Sep 17 00:00:00 2001
From: Kavin <78342682+kavin-114@users.noreply.github.com>
Date: Tue, 3 Mar 2026 21:28:34 +0530
Subject: [PATCH] fix: resolve conflicts

---
 .../landed_cost_voucher/test_landed_cost_voucher.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index a81f92dd369..737df053832 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -1124,18 +1124,6 @@ def make_landed_cost_voucher(**args):
 		],
 	)
 
-<<<<<<< HEAD
-	lcv.set(
-		"taxes",
-		[
-			{
-				"description": "Shipping Charges",
-				"expense_account": args.expense_account or "Expenses Included In Valuation - TCP1",
-				"amount": args.charges,
-			}
-		],
-	)
-=======
 	if args.charges:
 		lcv.set(
 			"taxes",
@@ -1147,7 +1135,6 @@ def make_landed_cost_voucher(**args):
 				}
 			],
 		)
->>>>>>> d54d0c25a2 (fix: set company based expense account)
 
 	if not args.do_not_save:
 		lcv.insert()