chore: resolve conflict

2026-02-19 17:45:04 +00:00 · 2024-10-28 13:33:24 +05:30
parent 29aa5d6468
commit 303ae8321b
1 changed files with 0 additions and 4 deletions
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1633,11 +1633,7 @@
 "idx": 204,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2024-09-11 12:59:19.130593",
-=======
 "modified": "2024-10-25 18:13:01.944477",
->>>>>>> 912e1e3f3d (fix: hide payment terms for return and paid purchase invoices)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Purchase Invoice",