From c72ae178fa9e0435d97791d027533602abcdf5a0 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Sun, 3 Jul 2022 14:05:34 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index cdfb631284c..8f7038df30e 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -476,10 +476,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 			});
 			this.frm.trigger("calculate_timesheet_totals");
 		}
-	}
-<<<<<<< HEAD
-});
-=======
+	},
 
 	is_cash_or_non_trade_discount() {
 		this.frm.set_df_property("additional_discount_account", "hidden", 1 - this.frm.doc.is_cash_or_non_trade_discount);
@@ -487,8 +484,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 			this.frm.set_value("additional_discount_account", "");
 		}
 	}
-};
->>>>>>> 169ff5a0dd (feat: Cash and Non trade discounts in Sales Invoice)
+
+});
 
 // for backward compatibility: combine new and previous states
 $.extend(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_frm}));