From 6cd2ba5c663e6b9b89bf6938a158fe9a849f51cc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 1 Mar 2023 16:25:25 +0530
Subject: [PATCH] fix: Resolve conflicts

(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
---
 .../accounts/report/general_ledger/general_ledger.html    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index e91c05dfb8..2d5ca49765 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -52,13 +52,6 @@
 					{% if(data[i].bill_no) { %}
 						<br>{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
 					{% } %}
-<<<<<<< HEAD
-					</td>
-					<td style="text-align: right">
-						{%= format_currency(data[i].debit, filters.presentation_currency || data[i].account_currency) %}</td>
-					<td style="text-align: right">
-						{%= format_currency(data[i].credit, filters.presentation_currency || data[i].account_currency) %}</td>
-=======
 					</span>
 				</td>
 				<td style="text-align: right">
@@ -67,7 +60,6 @@
 				<td style="text-align: right">
 					{%= format_currency(data[i].credit, filters.presentation_currency) %}
 				</td>
->>>>>>> ba66a6714c (fix: Wrap unexpectedly long text in remark)
 			{% } else { %}
 				<td></td>
 				<td></td>