From 7318748a4ccc51c69fb6f86ef49c9cc8d9df1d83 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:07:30 +0530
Subject: [PATCH] fix: resolved conflicts

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

diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 6bf3333d4d3..fca0cf7877a 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -595,11 +595,7 @@
    "link_fieldname": "target_asset"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-08-26 23:28:29.095139",
-=======
  "modified": "2024-12-26 14:23:20.968882",
->>>>>>> 6850019649 (feat: work in progress status for asset (#45066))
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset",