fix: conflicts

2023-07-10 17:14:25 +05:30
parent 79f9785d15
commit e55a264e57
1 changed files with 2 additions and 6 deletions
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -477,11 +477,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2022-11-16 14:21:26.125815",
-=======
- "modified": "2023-07-06 18:43:45.599761",
->>>>>>> d618aaef32 (fix: accepted warehouse and rejected warehouse can't be same)
+ "modified": "2023-07-06 18:44:45.599761",
 "modified_by": "Administrator",
 "module": "Subcontracting",
 "name": "Subcontracting Receipt Item",
@@ -492,4 +488,4 @@
 "sort_field": "modified",
 "sort_order": "DESC",
 "states": []
-}
+}