fvogt updated this revision to Diff 44334. fvogt added a comment.
Fix bad merge REPOSITORY R282 NetworkManagerQt CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D16471?vs=44332&id=44334 BRANCH ifadded REVISION DETAIL https://phabricator.kde.org/D16471 AFFECTED FILES src/manager.cpp src/manager_p.h src/secretagent.cpp src/secretagent.h src/secretagent_p.h To: fvogt, #frameworks, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns
