From dc9f6a58c85ff2b02f5fc29930aca9eadbeb845f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 5 Oct 2021 17:26:52 +0530
Subject: [PATCH] fix: Resolved conflict

---
 frappe/public/js/frappe/list/list_settings.js | 2 +-
 frappe/public/js/frappe/utils/utils.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_settings.js b/frappe/public/js/frappe/list/list_settings.js
index 3a82935a53..782a077a78 100644
--- a/frappe/public/js/frappe/list/list_settings.js
+++ b/frappe/public/js/frappe/list/list_settings.js
@@ -114,7 +114,7 @@ export default class ListSettings {
 
 					<div class="row">
 						<div class="col-md-1">
-							${frappe.utils.icon("drag", "xs", "", "sortable-handle " + show_sortable_handle)}
+							${frappe.utils.icon("drag", "xs", "", "", "sortable-handle " + show_sortable_handle)}
 						</div>
 						<div class="col-md-10" style="padding-left:0px;">
 							${me.fields[idx].label}
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 0a80bb081c..825bd8c1a1 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1123,7 +1123,7 @@ Object.assign(frappe.utils, {
 		}
 	},
 
-	icon(icon_name, size="sm", icon_class="", svg_class="") {
+	icon(icon_name, size="sm", icon_class="", icon_style="", svg_class="") {
 		let size_class = "";
 		let icon_style = "";
 		if (typeof size == "object") {