cfeck added a comment.
Use "Update Diff" to upload the correct diff. If you switched between different branches (as the current diff suggests), please make sure you solve the git issues first. If everything else fails, "git reset origin/master", and re-apply your changes. REPOSITORY R105 KDE SSH Password Dialog REVISION DETAIL https://phabricator.kde.org/D4540 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: idekels, whiting, bbuch, mpyne, cfeck Cc: broulik, bbuch, cfeck, plasma-devel, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol
