ngraham added inline comments.
INLINE COMMENTS
> ExpandedRepresentation.qml:43
>
> - RowLayout {
> -
> - PlasmaExtras.Heading {
> - id: heading
> - Layout.fillWidth: true
> - level: 1
> - Layout.leftMargin: {
> - //Menu mode
> - if (!activeApplet && hiddenItemsView.visible &&
> !LayoutMirroring.enabled) {
> - return units.smallSpacing;
> -
> - //applet open, sidebar
> - } else if (activeApplet && hiddenItemsView.visible &&
> !LayoutMirroring.enabled) {
> - return hiddenItemsView.width + units.largeSpacing;
> -
> - //applet open, no sidebar
> - } else {
> - return units.smallSpacing;
> +<<<<<<< HEAD
> + PlasmaExtras.PlasmoidHeading {
merge conflict remnant
REPOSITORY
R120 Plasma Workspace
REVISION DETAIL
https://phabricator.kde.org/D27189
To: niccolove, #vdg, #plasma, ngraham
Cc: mart, ngraham, ndavis, plasma-devel, Orage, LeGast00n, The-Feren-OS-Dev,
cblack, jraleigh, zachus, fbampaloukas, GB_2, ragreen, ZrenBot, himcesjf,
lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra
