From e3b2cc24b2ce3440c7126c197f0ba82400821b63 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Thu, 20 Nov 2025 16:12:41 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../stock_reconciliation_item.json                          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 47e59d7e9e8..e61591694e0 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -254,11 +254,7 @@
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-03-12 16:34:51.326821",
-=======
  "modified": "2025-11-20 15:27:13.868179",
->>>>>>> 20e0313a8c (fix: unhide zero val checkbox)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reconciliation Item",
@@ -269,4 +265,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}