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

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

diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 2bd9b1f2158..4ce8342af6e 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -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
-}
\ No newline at end of file
+}