From 15881ea71865cab1a4d61dad27df8d6c00b92daa Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 30 Oct 2024 10:28:30 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../payment_reconciliation_payment.json       |  4 ---
 .../payment_reconciliation_payment.py         | 27 -------------------
 2 files changed, 31 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index 8e3ff2288aa..010e93558cf 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -110,11 +110,7 @@
  "is_virtual": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-17 17:33:34.818530",
-=======
  "modified": "2024-10-29 16:24:43.021230",
->>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Payment",
diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
index e55d6a717b3..1c66b9b4cb5 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
@@ -6,33 +6,6 @@ from frappe.model.document import Document
 
 
 class PaymentReconciliationPayment(Document):
-<<<<<<< HEAD
-=======
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		amount: DF.Currency
-		cost_center: DF.Link | None
-		currency: DF.Link | None
-		difference_amount: DF.Currency
-		exchange_rate: DF.Float
-		is_advance: DF.Data | None
-		parent: DF.Data
-		parentfield: DF.Data
-		parenttype: DF.Data
-		posting_date: DF.Date | None
-		reference_name: DF.DynamicLink | None
-		reference_row: DF.Data | None
-		reference_type: DF.Link | None
-		remarks: DF.SmallText | None
-	# end: auto-generated types
-
->>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation)
 	@staticmethod
 	def get_list(args):
 		pass