From 5f4aaed5a017dceeec7b72c7df0db42e9e27e681 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 8 Jul 2025 08:34:16 +0530
Subject: [PATCH] chore: fix conflicts

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

diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
index 89a599e4b6e..45f570bbdc0 100644
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
@@ -188,11 +188,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-10-05 12:52:18.705431",
-=======
  "modified": "2025-07-07 15:51:29.329064",
->>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Inventory Dimension",
@@ -236,12 +232,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
  "sort_order": "DESC",
  "states": []
 }