From 8cca74d5ef720788512108e0a2610db42935c6a9 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 14 May 2024 19:29:23 +0530
Subject: [PATCH] fix: resolved conflict

---
 erpnext/assets/doctype/asset/asset.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index da1a6eb07a9..3a2a942bdf2 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -589,11 +589,7 @@
    "link_fieldname": "target_asset"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-01-15 17:35:49.226603",
-=======
  "modified": "2024-04-18 16:45:47.306032",
->>>>>>> 31841b4ab2 (refactor: renamed purchase receipt amount field to purchase amount)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset",
@@ -637,4 +633,4 @@
  "states": [],
  "title_field": "asset_name",
  "track_changes": 1
-}
\ No newline at end of file
+}