CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 00:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-04-24 11:33:34 +05:30
parent a22be6f9b9
commit 35230a9692
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
View File

@@ -135,20 +135,12 @@
],
"index_web_pages_for_search": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-04-18 08:25:35.302081",
=======
"modified": "2024-04-18 15:25:25.808355",
>>>>>>> f6f118855b (fix: Permission for lower dedcution certificate)
"modified_by": "Administrator",
"module": "Regional",
"name": "Lower Deduction Certificate",
"naming_rule": "By fieldname",
"owner": "Administrator",
<<<<<<< HEAD
"permissions": [],
"sort_field": "modified",
=======
"permissions": [
{
"create": 1,
@@ -188,7 +180,6 @@
}
],
"sort_field": "creation",
>>>>>>> f6f118855b (fix: Permission for lower dedcution certificate)
"sort_order": "DESC",
"states": [],
"track_changes": 1