chore: resolve conflicts

2026-02-15 23:54:59 +00:00 · 2026-02-06 12:00:47 +05:30
parent f56c6f93a1
commit 4847a76cb8
1 changed files with 0 additions and 4 deletions
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2307,11 +2307,7 @@
   "link_fieldname": "consolidated_invoice"
  }
 ],
-<<<<<<< HEAD
- "modified": "2026-02-03 14:09:44.347133",
-=======
 "modified": "2026-02-05 20:43:44.732805",
->>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice",