From e2f8ca5f875f5f1990147cd837cd9b314ed930d4 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 22 Apr 2025 16:46:57 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../stock/doctype/material_request/material_request.json  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 88344bad8a7..8df61fe7fb8 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -357,15 +357,7 @@
  "idx": 70,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2023-09-15 12:07:24.789471",
-=======
  "modified": "2025-04-21 18:36:04.827917",
->>>>>>> ecf15130ba (fix: backslash in url)
-=======
- "modified": "2024-12-16 12:46:02.262167",
->>>>>>> eaaf34cda6 (fix: revert unintended changes)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Material Request",