From b7c5a375c3b11ee27a79a34041899c803695b817 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 17 Jun 2022 18:05:59 +0300
Subject: [PATCH] Fix merge

---
 apps/documenteditor/main/app/view/RoleEditDlg.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/documenteditor/main/app/view/RoleEditDlg.js b/apps/documenteditor/main/app/view/RoleEditDlg.js
index eac2afc6a..8909fc7bb 100644
--- a/apps/documenteditor/main/app/view/RoleEditDlg.js
+++ b/apps/documenteditor/main/app/view/RoleEditDlg.js
@@ -111,7 +111,6 @@ define([
                             '993366', 'C0C0C0', 'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', 'C9C8FF', 'CC99FF', 'FFFFFF'
                         ],
                 color: this.lastColor,
-                paletteHeight: 94,
                 cls: 'move-focus',
                 takeFocusOnClose: true
             });