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

chore: resolve conflicts

Browse Source
This commit is contained in:
Raffael Meyer
2023-11-23 15:10:29 +01:00
committed by GitHub
parent 06c6da5c0d
commit 2293696ab4
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -739,10 +739,6 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
<<<<<<< HEAD
"links": [],
"modified": "2023-06-19 11:38:04.387219",
=======
"links": [ "links": [
{ {
"is_child_table": 1, "is_child_table": 1,
@@ -753,7 +749,6 @@
} }
], ],
"modified": "2023-11-23 12:07:20.887885", "modified": "2023-11-23 12:07:20.887885",
>>>>>>> 3be345e605 (feat: add Bank Transaction to connections in Journal and Payment Entry (#38297))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry", "name": "Payment Entry",
@@ -799,4 +794,4 @@
"states": [], "states": [],
"title_field": "title", "title_field": "title",
"track_changes": 1 "track_changes": 1
} }