michaelh planned changes to this revision. michaelh added a comment.
There are merging errors REPOSITORY R824 Baloo Widgets REVISION DETAIL https://phabricator.kde.org/D10105 To: michaelh, elvisangelaccio, ngraham, vhanda, smithjd, #dolphin, #frameworks