From dcfae61a7a3511d8912eb2c696accd282ceb0497 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 13 May 2025 17:07:14 +0530
Subject: [PATCH] fix: resolved conflicts

---
 erpnext/assets/doctype/asset_category/asset_category.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/assets/doctype/asset_category/asset_category.json b/erpnext/assets/doctype/asset_category/asset_category.json
index 73bc603017b..575b7a0c45f 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.json
+++ b/erpnext/assets/doctype/asset_category/asset_category.json
@@ -73,11 +73,7 @@
   }
  ],
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-02-24 15:05:38.621803",
-=======
  "modified": "2025-05-13 15:33:03.791814",
->>>>>>> fbbfd6531b (feat: add non depreciable category checkbox in asset category)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Category",