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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-22 20:49:56 +05:30
committed by GitHub
parent b9b08c35ef
commit 736b125e14
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/gl_entry/gl_entry.json
View File

@@ -259,11 +259,7 @@
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-19 18:30:49.613401",
=======
"modified": "2025-03-21 15:29:11.221890", "modified": "2025-03-21 15:29:11.221890",
>>>>>>> 92be7cbbbf (perf: timeout while renaming cost center)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",
@@ -297,4 +293,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }