Fix broken merge.
commitbe79543389179501c51ed608b6b874e85b466661
authorMichał Sawicz <michal.sawicz@canonical.com>
dateWed 5 Mar 2014, 17:25 (13 years ago)
parente903cd5
qml/Dash/CardHeader.qml−2
@@ -98,7 +98,6 @@ Item {
9898 fontSize: "small"
9999 wrapMode: Text.Wrap
100100 maximumLineCount: 2
101− fontSize: "small"
102101 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
103102 color: fontColor
104103 }
@@ -111,7 +110,6 @@ Item {
111110 fontSize: "small"
112111 font.weight: Font.Light
113112 visible: titleLabel.text && text
114− fontSize: "x-small"
115113 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
116114 color: fontColor
117115 }