From 7b907424095b38fab9db9902b9d8424d08ee36d6 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 30 Dec 2024 14:50:23 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../manufacturing/doctype/blanket_order/blanket_order.json    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
index 38f5a5e8276..0e2e7273f10 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
@@ -147,11 +147,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-06-29 00:30:30.621636",
-=======
  "modified": "2024-12-05 15:44:21.520093",
->>>>>>> 5a284df51d (refactor: Order Number and Order Date fields to Blanket Order)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Blanket Order",