CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-09 21:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-08-08 11:53:49 +05:30
committed by GitHub
parent 16c94d292c
commit fb3725752f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
View File

@@ -311,11 +311,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-02-18 19:10:07.742298",
=======
"modified": "2022-08-04 17:13:51.964203",
>>>>>>> a272d73dd9 (fix: pending principal- amount)
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan Repayment",
@@ -357,4 +353,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}