nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-06-14 11:36:43 +05:30
committed by GitHub
parent 823cf88c3c
commit da1a948a28
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -1174,11 +1174,7 @@
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-03-23 16:49:36.297403",
=======
"modified": "2022-06-11 20:35:32.635804", "modified": "2022-06-11 20:35:32.635804",
>>>>>>> 118c786e63 (fix: Partially Ordered status for quotation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",
@@ -1274,4 +1270,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"timeline_field": "party_name", "timeline_field": "party_name",
"title_field": "title" "title_field": "title"
} }