From 376293326b49d7c9daeb7007f72b13dfaf265797 Mon Sep 17 00:00:00 2001 From: Sagar Sharma Date: Fri, 19 Aug 2022 15:30:50 +0530 Subject: [PATCH] chore: conflicts --- .../subcontracting_receipt/subcontracting_receipt.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json index ee96c50ba14..3aa8e61ae09 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json @@ -616,11 +616,7 @@ ], "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2022-08-16 09:56:41.199435", -======= "modified": "2022-08-18 15:48:57.419191", ->>>>>>> 256b4245d5 (chore: add additional-cost table in SCR) "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Receipt",