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

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

diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
index f097535cf07..20250622fda 100644
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
@@ -224,12 +224,7 @@
    "role": "Stock User"
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 8aac6a6b18 (fix: fetch from parent optional in inventory dimension)
  "sort_order": "DESC",
  "states": []
 }