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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-02 19:18:02 +05:30
committed by GitHub
parent 152921b82a
commit ca6caa86bc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom_creator/bom_creator.json
View File

@@ -288,11 +288,7 @@
"link_fieldname": "bom_creator" "link_fieldname": "bom_creator"
} }
], ],
<<<<<<< HEAD
"modified": "2023-08-07 15:45:06.176313",
=======
"modified": "2024-04-02 16:30:59.779190", "modified": "2024-04-02 16:30:59.779190",
>>>>>>> 0b63dbf221 (chore: remove rate of material based on Manual)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Creator", "name": "BOM Creator",