From 2fdf6ab16497e11e33b2afa4865d5c5d828ce6f1 Mon Sep 17 00:00:00 2001
From: s-aga-r <sagarsharma.s312@gmail.com>
Date: Thu, 16 Feb 2023 14:01:17 +0530
Subject: [PATCH] chore: `conflicts`

---
 erpnext/stock/doctype/item/item.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index aef8dde7733..e519b9b2133 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -911,11 +911,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
-<<<<<<< HEAD
- "modified": "2022-09-13 04:08:17.431731",
-=======
  "modified": "2023-02-14 04:48:26.343620",
->>>>>>> 4d79ffe3c6 (fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053))
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",