nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-04-22 16:46:57 +05:30
parent 4fba4d49d2
commit e2f8ca5f87
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/material_request/material_request.json
View File

@@ -357,15 +357,7 @@
"idx": 70, "idx": 70,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2023-09-15 12:07:24.789471",
=======
"modified": "2025-04-21 18:36:04.827917", "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", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",