From f53a45cfefd6896c99c2f8d794021fc07f505ea4 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 21 Apr 2025 16:30:20 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../purchase_taxes_and_charges.json                      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 0d92a538b3d..008d63ae76f 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -239,23 +239,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-04-08 19:51:36.678551",
-=======
  "modified": "2025-04-15 13:14:48.936047",
->>>>>>> be556167b1 (fix: Modify .json from desk to change `modified`)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Taxes and Charges",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> be556167b1 (fix: Modify .json from desk to change `modified`)
  "sort_order": "DESC",
  "track_changes": 1
 }