From 17076b3ce4b08cf167124a718b8f117d63538479 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 9 Feb 2026 16:31:33 +0530
Subject: [PATCH] chore: fix conflicts

(cherry picked from commit 7f69556c45963f51a8f9494436edff67d437e495)
---
 erpnext/stock/doctype/stock_settings/stock_settings.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index ed1417ad6cb..9e6eb8d6f2d 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -553,11 +553,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-11-11 11:35:39.864923",
-=======
  "modified": "2026-02-09 15:01:12.466175",
->>>>>>> 376ab0e346 (feat: allow negative stock for the batch item)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Settings",