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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-04-17 11:38:13 +05:30
committed by GitHub
parent e278688a4b
commit 5f41036f4a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,11 +778,7 @@
"table_fieldname": "payment_entries" "table_fieldname": "payment_entries"
} }
], ],
<<<<<<< HEAD
"modified": "2024-01-03 12:46:41.759121",
=======
"modified": "2024-04-11 11:25:07.366347", "modified": "2024-04-11 11:25:07.366347",
>>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry", "name": "Payment Entry",