D27823: Use consistent highlight
Nathaniel Graham
noreply at phabricator.kde.org
Sun Mar 8 15:42:13 GMT 2020
ngraham added a comment.
you need to rebase on top of `master` from the remote. This looks to have been branched off of the state of master from last November or something.
Try `git pull --rebase origin master` That should give you some merge conflicts that you can fix.
REPOSITORY
R116 Plasma Network Management Applet
REVISION DETAIL
https://phabricator.kde.org/D27823
To: niccolove, jgrulich, #vdg, ngraham
Cc: ngraham, 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, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20200308/b7399976/attachment.html>
More information about the Plasma-devel
mailing list