From 223fe626380173386aeba1a43d573d46fa173d8c Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 5 Feb 2025 14:43:24 +0530
Subject: [PATCH] fix: resolved conflicts

---
 .../asset_value_adjustment/asset_value_adjustment.json      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
index e2695979bd2..6b5b53d9847 100644
--- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
+++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
@@ -136,11 +136,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-01-22 14:10:23.085181",
-=======
  "modified": "2024-08-13 16:21:18.639208",
->>>>>>> d4fdada83c (feat: account heads changed along with journal entry type and descrip… (#42845))
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Value Adjustment",
@@ -197,4 +193,4 @@
  "sort_order": "DESC",
  "title_field": "asset",
  "track_changes": 1
-}
\ No newline at end of file
+}