From ca6caa86bca149eb2e6846f2aee35de0f06aa75f Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 2 Apr 2024 19:18:02 +0530
Subject: [PATCH] chore: fix conflicts

---
 erpnext/manufacturing/doctype/bom_creator/bom_creator.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.json b/erpnext/manufacturing/doctype/bom_creator/bom_creator.json
index 32565bb7850..9d2384e31a0 100644
--- 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
-}
\ No newline at end of file
+}