nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-04-09 15:39:15 +05:30
committed by GitHub
parent 8e9ddb7a69
commit b8ef83e1ea
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/pos_profile/pos_profile.json
View File

@@ -451,12 +451,8 @@
"role": "Accounts User" "role": "Accounts User"
} }
], ],
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic", "row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> 821d64241a (fix: added missing project field on pos profile)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }