From dccc561eec5f952b85ba24331f12630f4de25b8a Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 14 Oct 2025 17:25:48 +0530
Subject: [PATCH] fix: resolve conflict

---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 7de51134ac9..193014d340d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -797,10 +797,7 @@ frappe.ui.form.on("Sales Invoice", {
 					is_group: 0,
 				},
 			};
-<<<<<<< HEAD
 		};
-=======
-		});
 
 		frm.set_query("sales_person", "sales_team", function () {
 			return {
@@ -810,7 +807,6 @@ frappe.ui.form.on("Sales Invoice", {
 				},
 			};
 		});
->>>>>>> 2fcd406b18 (fix: filter sales team to show only active individual salespersons)
 	},
 	onload: function (frm) {
 		frm.redemption_conversion_factor = null;