CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 09:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-03-31 11:41:00 +05:30
committed by GitHub
parent 5fb642831c
commit 390b4986f9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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