From 6d32089d9e8a27865858de3f78cb0743c8bf92d8 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Thu, 19 Feb 2026 10:51:40 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
index 8832ec1e2e4..41bfbd85e22 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
@@ -314,11 +314,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-07 16:05:17.772098",
-=======
  "modified": "2026-02-19 10:17:28.695394",
->>>>>>> 21452b4c6e (fix: reservation based on field should be read only in SRE)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reservation Entry",
@@ -428,4 +424,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}