From 4847a76cb87d49cd64e0d7b6b50aff2c105ca5e7 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Fri, 6 Feb 2026 12:00:47 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index ec549710654..4d0e0c73458 100644
--- 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",