From e8b46d9815621568ab3a523058ad3a7fef80fb73 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 17 Feb 2026 12:13:33 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../manufacturing/doctype/plant_floor/plant_floor.json   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
index 311e4fd913b..556a0c33721 100644
--- a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
+++ b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
@@ -74,11 +74,7 @@
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-09-19 19:06:36.481625",
-=======
  "modified": "2026-02-17 11:53:17.940039",
->>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Plant Floor",
@@ -98,12 +94,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> fd72132743 (fix: do not allow plant floor company and warehouse to be updated)
  "sort_order": "DESC",
  "states": []
 }