michaelh updated this revision to Diff 26068. michaelh added a comment.
Correct merging errors REPOSITORY R824 Baloo Widgets CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10105?vs=26058&id=26068 BRANCH requestfinished (branched from master) REVISION DETAIL https://phabricator.kde.org/D10105 AFFECTED FILES src/filemetadataprovider.cpp src/filemetadataprovider.h To: michaelh, elvisangelaccio, ngraham, vhanda, smithjd, #dolphin, #frameworks
