From 184cabdcb021a4e8019c4324d1a2c757d647c29c Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Tue, 29 Jul 2025 21:02:04 +0530
Subject: [PATCH] chore: resolve conflict

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

diff --git a/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json b/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
index ed98aea4a98..2eafd0ba81a 100644
--- a/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
+++ b/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
@@ -70,11 +70,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-09-14 01:20:48.588052",
-=======
  "modified": "2025-07-29 13:09:57.323835",
->>>>>>> c18d565d3e (fix: change modified timestamp so migrations work)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Scrap Item",
@@ -84,4 +80,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}