From f5b2b807077cba5774e8c26c872fe4d80c99ae96 Mon Sep 17 00:00:00 2001
From: Sagar Sharma <sagarsharma.s312@gmail.com>
Date: Fri, 26 May 2023 00:26:14 +0530
Subject: [PATCH] chore: `conflict`

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

diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index bad66b4aded..b97e42c2468 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -867,11 +867,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
  "modified": "2023-05-01 21:05:14.175640",
-=======
- "modified": "2023-04-28 13:14:10.648655",
->>>>>>> e6fc281acf (feat: add field `Packed Qty` in `Delivery Note Item` and `Packed Item`)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Note Item",
@@ -881,4 +877,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}