fix: conflicts

2023-07-10 17:13:23 +05:30
parent 6459c28316
commit a178e6693c
1 changed files with 2 additions and 6 deletions
--- 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
-}
+}