From b397535392b5bfb57f6468d79ecaf7ca5d63f8c3 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Sat, 30 Mar 2024 20:04:53 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../subcontracting_receipt_item.json                        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
index 97545a3ffca..75e263e2c1c 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -582,11 +582,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-07 11:43:38.954262",
-=======
  "modified": "2024-03-29 15:42:43.425544",
->>>>>>> d73b1f3e6a (fix: button to select serial / batch bundle in the subcontracting receipt)
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt Item",
@@ -597,4 +593,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}