chore: resolve conflicts

2026-05-04 14:08:29 +00:00 · 2024-05-24 11:05:59 +05:30
parent 3ed3b214c8
commit c68afbc715
1 changed files with 1 additions and 5 deletions
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -927,11 +927,7 @@
 "idx": 1,
 "istable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-25 15:56:44.828634",
-=======
 "modified": "2024-05-23 16:36:18.970862",
->>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice Item",
@@ -941,4 +937,4 @@
 "sort_field": "modified",
 "sort_order": "DESC",
 "states": []
-}
+}