nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 02:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2026-04-21 16:15:21 +05:30
committed by GitHub
parent aa359aded4
commit 9e6300bf76
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

@@ -653,8 +653,6 @@
"fieldname": "tax_withholding_tab", "fieldname": "tax_withholding_tab",
"fieldtype": "Tab Break", "fieldtype": "Tab Break",
"label": "Tax Withholding" "label": "Tax Withholding"
<<<<<<< HEAD
=======
}, },
{ {
"fieldname": "auto_repeat_section", "fieldname": "auto_repeat_section",
@@ -666,7 +664,6 @@
"fieldname": "custom_remark", "fieldname": "custom_remark",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Custom Remark" "label": "Custom Remark"
>>>>>>> 697f521e14 (feat: use single remark field with custom remark toggle)
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",