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

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

diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index e1f084e0932..f33c7a65cff 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1240,11 +1240,7 @@
  "idx": 261,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-05-07 20:18:25.458185",
-=======
- "modified": "2023-07-04 17:23:17.025390",
->>>>>>> d618aaef32 (fix: accepted warehouse and rejected warehouse can't be same)
+ "modified": "2023-07-04 17:24:17.025390",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt",
@@ -1313,4 +1309,4 @@
  "timeline_field": "supplier",
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}