chore: fix conflicts

2024-04-02 19:18:02 +05:30
parent 152921b82a
commit ca6caa86bc
1 changed files with 1 additions and 5 deletions
--- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.json
+++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -288,11 +288,7 @@
   "link_fieldname": "bom_creator"
  }
 ],
-<<<<<<< HEAD
- "modified": "2023-08-07 15:45:06.176313",
-=======
 "modified": "2024-04-02 16:30:59.779190",
->>>>>>> 0b63dbf221 (chore: remove rate of material based on Manual)
 "modified_by": "Administrator",
 "module": "Manufacturing",
 "name": "BOM Creator",
@@ -331,4 +327,4 @@
 "sort_order": "DESC",
 "states": [],
 "track_changes": 1
-}
+}