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

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2024-03-20 19:58:01 +05:30
committed by GitHub
parent 4ede3a9ba5
commit 37eae8eb4e
1 changed files with 1 additions and 5 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, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-11-20 11:15:30.083077",
=======
"modified": "2024-03-20 16:03:59.069145", "modified": "2024-03-20 16:03:59.069145",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",