fix: resolve conflict

2026-04-27 02:28:30 +00:00 · 2026-04-21 16:15:21 +05:30
parent aa359aded4
commit 9e6300bf76
1 changed files with 0 additions and 3 deletions
--- 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",