nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-05-06 11:12:11 +05:30
committed by GitHub
parent fbbc0af7bc
commit 0b44cebe00
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/psoa_cost_center/psoa_cost_center.json
View File

@@ -19,11 +19,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2020-08-03 16:56:45.744905",
=======
"modified": "2024-05-03 17:16:51.666461", "modified": "2024-05-03 17:16:51.666461",
>>>>>>> 58f7039630 (fix: Cost center not getting saved in PSOA)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "PSOA Cost Center", "name": "PSOA Cost Center",
@@ -33,4 +29,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }