chore: resolve conflict

2026-02-15 15:45:01 +00:00 · 2025-04-09 15:39:15 +05:30
parent 8e9ddb7a69
commit b8ef83e1ea
1 changed files with 0 additions and 4 deletions
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -451,12 +451,8 @@
   "role": "Accounts User"
  }
 ],
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
 "row_format": "Dynamic",
 "sort_field": "creation",
->>>>>>> 821d64241a (fix: added missing project field on pos profile)
 "sort_order": "DESC",
 "states": []
 }