on xenial help sign in
Wops, fix merge
commitf131bc30e7809932d8d49f4a4e36e4bb1c1245a9 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 2 Sep 2015, 10:52 (11 years ago) parentbd18e16
1 file changed−4
qml/Dash/PageHeader.qml−4
qml/Dash/PageHeader.qml−4
@@ -250,12 +250,8 @@ Item {
250250 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
251251 property color panelColor: background.topColor
252252 panelForegroundColor: config.foregroundColor
253−<<<<<<< TREE
254− property var config: PageHeadConfiguration {
255−=======
256253 config: PageHeadConfiguration {
257254 title: root.title
258−>>>>>>> MERGE-SOURCE
259255 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
260256 backAction: Action {
261257 iconName: backIsClose ? "close" : "back"