nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-03-31 11:42:05 +05:30
committed by GitHub
parent 9b8bb4d6a2
commit 31017774f6
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@@ -927,11 +927,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:03:59.069145",
=======
"modified": "2024-03-28 10:20:30.231915", "modified": "2024-03-28 10:20:30.231915",
>>>>>>> 9828d34b19 (fix: markdown to text editor set for supplier quotation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",
@@ -999,4 +995,4 @@
"states": [], "states": [],
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "title" "title_field": "title"
} }