From f2b7319462db6d6a137db0e16255fa1502ed538e Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Fri, 26 Jun 2026 13:46:30 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json b/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
index 8915a580777..f95c4a69482 100644
--- a/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
+++ b/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
@@ -35,11 +35,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-02-19 20:33:30.657406",
-=======
  "modified": "2026-06-19 10:55:00.000000",
->>>>>>> adfef48a65 (fix: allow rename for Quality Inspection Parameter)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quality Inspection Parameter",
@@ -98,4 +94,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}