From ddbdcbb026acbfc6cbbdbd0ce4506a4d809b8155 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 25 Jun 2025 14:47:47 +0530
Subject: [PATCH] chore: resolved conflicts

---
 erpnext/assets/doctype/asset_movement/asset_movement.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.json b/erpnext/assets/doctype/asset_movement/asset_movement.json
index 1bd1ad83ead..a656acf1265 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.json
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.json
@@ -97,11 +97,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-28 16:54:26.571083",
-=======
  "modified": "2025-05-30 17:01:55.864353",
->>>>>>> f5e5146021 (feat: added Transfer and Issue option in purpose)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Movement",
@@ -154,12 +150,8 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
  "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> f5e5146021 (feat: added Transfer and Issue option in purpose)
  "sort_order": "DESC",
  "states": []
 }