From cecd17728678089b845e699248340b2ad6096542 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Sat, 27 Sep 2025 10:03:27 +0530
Subject: [PATCH] chore: fix conflicts

Removed fields related to job card and landed cost voucher amount from subcontracting receipt item.
---
 .../subcontracting_receipt_item.json          | 22 -------------------
 1 file changed, 22 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 0da669da9c8..5a02ab91bf0 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -582,23 +582,6 @@
    "fieldname": "add_serial_batch_for_rejected_qty",
    "fieldtype": "Button",
    "label": "Add Serial / Batch No (Rejected Qty)"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "job_card",
-   "fieldtype": "Link",
-   "label": "Job Card",
-   "options": "Job Card",
-   "read_only": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "landed_cost_voucher_amount",
-   "fieldtype": "Currency",
-   "label": "Landed Cost Voucher Amount",
-   "no_copy": 1,
-   "read_only": 1
   },
   {
    "fieldname": "column_break_exht",
@@ -609,17 +592,12 @@
    "fieldtype": "Link",
    "label": "Service Expense Account",
    "options": "Account"
->>>>>>> 6e597b9c42 (feat: service expense account in the subcontracting receipt)
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-12-06 15:23:58.680169",
-=======
  "modified": "2025-09-26 12:00:38.877638",
->>>>>>> 6e597b9c42 (feat: service expense account in the subcontracting receipt)
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt Item",