chore: resolve conflict

2024-08-13 14:38:44 +05:30
parent 25096185c9
commit b0b5b25a53
1 changed files with 0 additions and 4 deletions
--- 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);