chore: fix conflicts

2024-03-31 11:42:05 +05:30
parent 9b8bb4d6a2
commit 31017774f6
1 changed files with 1 additions and 5 deletions
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -927,11 +927,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",
@@ -999,4 +995,4 @@
 "states": [],
 "timeline_field": "supplier",
 "title_field": "title"
-}
+}