chore: resolve conflicts

frappe · Aug 8, 2022 · fb37257 · fb37257
1 parent 16c94d2
commit fb37257
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
@@ -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
-}
+}