chore: resolve conflicts

2026-05-01 04:28:27 +00:00 · 2026-01-31 20:19:07 +05:30
parent 6cecae288c
commit 4017936bef
1 changed files with 0 additions and 5 deletions
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -717,12 +717,7 @@
 "name": "Quotation Item",
 "owner": "Administrator",
 "permissions": [],
-<<<<<<< HEAD
 "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation)
 "sort_order": "DESC",
 "states": [],
 "track_changes": 1