From b0b5b25a532d59b49fbe4a31c03caa186e8ea188 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 13 Aug 2024 14:38:44 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/selling/page/sales_funnel/sales_funnel.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index efe38305a8a..d9a0be9eedd 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -248,11 +248,7 @@ erpnext.SalesFunnel = class SalesFunnel {
 		context.fill();
 
 		// draw text
-<<<<<<< HEAD
-		context.fillStyle = "";
-=======
 		context.fillStyle = getComputedStyle(document.body).getPropertyValue("--text-color");
->>>>>>> 61bc0925d5 (fix: text color in sales funnel report based on theme)
 		context.textBaseline = "middle";
 		context.font = "1.1em sans-serif";
 		context.fillText(__(title), width + 20, y_mid);