From 79f9785d151217381af0ad24a66f521123a483c7 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 10 Jul 2023 17:13:55 +0530
Subject: [PATCH] fix: conflicts

---
 .../subcontracting_receipt/subcontracting_receipt.json    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
index e722c178782..d572ae3d4be 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -630,11 +630,7 @@
  "in_create": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-11-16 14:18:57.001239",
-=======
- "modified": "2023-07-06 18:43:16.171842",
->>>>>>> d618aaef32 (fix: accepted warehouse and rejected warehouse can't be same)
+ "modified": "2023-07-06 18:44:16.171842",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt",
@@ -703,4 +699,4 @@
  "timeline_field": "supplier",
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}