CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 17:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

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

6
erpnext/manufacturing/doctype/bom/bom.json
View File

@@ -637,11 +637,7 @@
"image_field": "image",
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-12-26 19:34:08.159312",
=======
"modified": "2024-04-02 16:22:47.518411",
>>>>>>> 0b63dbf221 (chore: remove rate of material based on Manual)
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM",
@@ -680,4 +676,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}