From 9e6300bf76b8534d52296f0725a71686e677f541 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 21 Apr 2026 16:15:21 +0530
Subject: [PATCH] fix: resolve conflict

---
 erpnext/accounts/doctype/journal_entry/journal_entry.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index e080c206ab5..0eaefb5f618 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -653,8 +653,6 @@
    "fieldname": "tax_withholding_tab",
    "fieldtype": "Tab Break",
    "label": "Tax Withholding"
-<<<<<<< HEAD
-=======
   },
   {
    "fieldname": "auto_repeat_section",
@@ -666,7 +664,6 @@
    "fieldname": "custom_remark",
    "fieldtype": "Check",
    "label": "Custom Remark"
->>>>>>> 697f521e14 (feat: use single remark field with custom remark toggle)
   }
  ],
  "icon": "fa fa-file-text",