From fb3725752ff005aff70493d94df87418ff8b3831 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Mon, 8 Aug 2022 11:53:49 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/loan_repayment/loan_repayment.json              | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
index cd807984dab..71f93e26bdb 100644
--- 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
-}
\ No newline at end of file
+}