From 9e99eda3c3d2fa1ca409639fe559a5763b03b6d1 Mon Sep 17 00:00:00 2001
From: Ninad1306 <ninad_1063@yahoo.com>
Date: Thu, 25 Jul 2024 18:39:20 +0530
Subject: [PATCH] fix: field_type is small text for v15

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

diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
index 6d99a80fa58..b8bda832983 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -183,13 +183,8 @@
   },
   {
    "fieldname": "address_display",
-<<<<<<< HEAD
    "fieldtype": "Small Text",
-   "label": "Supplier Address Details",
-=======
-   "fieldtype": "Text Editor",
    "label": "Job Worker Address Details",
->>>>>>> 302339998f (fix: Fields Modification for Subcontracting DocTypes (#42383))
    "read_only": 1
   },
   {