ngraham updated this revision to Diff 48820. ngraham added a comment.
Fix rebase barf REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D17911?vs=48819&id=48820 BRANCH master REVISION DETAIL https://phabricator.kde.org/D17911 AFFECTED FILES autotests/knewfilemenutest.cpp src/filewidgets/knewfilemenu.cpp To: ngraham, #frameworks, dfaure, elvisangelaccio, aacid Cc: kde-frameworks-devel, michaelh, ngraham, bruns