From f31b0085027f8aa524125490899c54893305c7ed Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Mon, 30 Jun 2025 01:03:49 +0530
Subject: [PATCH] chore: resolved conflicts

---
 erpnext/assets/doctype/asset_repair/asset_repair.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index 5d7ce569fbb..a28afa280de 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -249,11 +249,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-06-13 16:14:14.398356",
-=======
  "modified": "2025-06-29 22:30:00.589597",
->>>>>>> c6baa34812 (fix: validate asset before repair)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -291,12 +287,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> c6baa34812 (fix: validate asset before repair)
  "sort_order": "DESC",
  "states": [],
  "title_field": "asset_name",