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

fix: merge conflicts

Browse Source
This commit is contained in:
Nishka Gosalia
2026-05-23 15:35:19 +05:30
parent 914576040e
commit 59e9f5192c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/project/project.json
View File

@@ -464,11 +464,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"max_attachments": 4, "max_attachments": 4,
<<<<<<< HEAD
"modified": "2025-08-21 17:57:58.314809",
=======
"modified": "2026-05-22 16:45:50.762759", "modified": "2026-05-22 16:45:50.762759",
>>>>>>> 9d8f3863f2 (fix(project): update customer and sales order as no copy)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Project", "name": "Project",