Fix merge
This commit is contained in:
parent
3a0b9f7a76
commit
b7c5a375c3
|
@ -111,7 +111,6 @@ define([
|
||||||
'993366', 'C0C0C0', 'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', 'C9C8FF', 'CC99FF', 'FFFFFF'
|
'993366', 'C0C0C0', 'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', 'C9C8FF', 'CC99FF', 'FFFFFF'
|
||||||
],
|
],
|
||||||
color: this.lastColor,
|
color: this.lastColor,
|
||||||
paletteHeight: 94,
|
|
||||||
cls: 'move-focus',
|
cls: 'move-focus',
|
||||||
takeFocusOnClose: true
|
takeFocusOnClose: true
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue