fix bad merge
commit5259b8500fc6e4cec40551aca26c29aa6058dae9
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateFri 20 Nov 2015, 14:06 (11 years ago)
parent82fc423
qml/Components/PanelState/PanelState.qml+1−3
@@ -23,9 +23,7 @@ QtObject {
2323 property string title: ""
2424 property bool buttonsVisible: false
2525 property bool dropShadow: false
26− property real panelHeight: units.gu(3)
27−
28− property int panelHeight: 0
26+ property int panelHeight: units.gu(3)
2927
3028 signal close()
3129 signal minimize()