chore: resolve conflicts

2022-06-14 11:36:43 +05:30
parent 823cf88c3c
commit da1a948a28
1 changed files with 1 additions and 5 deletions
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1174,11 +1174,7 @@
 "idx": 82,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2022-03-23 16:49:36.297403",
-=======
 "modified": "2022-06-11 20:35:32.635804",
->>>>>>> 118c786e63 (fix: Partially Ordered status for quotation)
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Quotation",
@@ -1274,4 +1270,4 @@
 "sort_order": "DESC",
 "timeline_field": "party_name",
 "title_field": "title"
-}
+}