nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-12 17:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-13 11:21:09 +05:30
parent f3401243be
commit 70d5593ace
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/process_statement_of_accounts/process_statement_of_accounts.json
View File

@@ -393,11 +393,7 @@
} }
], ],
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-12-18 12:20:08.965120",
=======
"modified": "2024-08-13 10:41:18.381165", "modified": "2024-08-13 10:41:18.381165",
>>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Statement Of Accounts", "name": "Process Statement Of Accounts",