From ba4d49640467b148a804a4788766048e08992cdb Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Tue, 8 Mar 2022 09:55:36 +0530
Subject: [PATCH] fix: Resolve conflicts

---
 erpnext/selling/doctype/quotation/quotation.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 0ff00c09762..474cf56fc1b 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -38,7 +38,6 @@ frappe.ui.form.on('Quotation', {
 	}
 });
 
-<<<<<<< HEAD
 erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
 	onload: function(doc, dt, dn) {
 		var me = this;
@@ -46,13 +45,6 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
 
 	},
 	party_name: function() {
-=======
-erpnext.selling.QuotationController = class QuotationController extends erpnext.selling.SellingController {
-	onload(doc, dt, dn) {
-		super.onload(doc, dt, dn);
-	}
-	party_name() {
->>>>>>> 3a547cb0d9 (fix: Item discounts for quotation)
 		var me = this;
 		erpnext.utils.get_party_details(this.frm, null, null, function() {
 			me.apply_price_list();