sharvey marked 2 inline comments as done. sharvey added a comment.
Merge errors tracked down and eradicated. INLINE COMMENTS > ngraham wrote in kdiroperatordetailview.cpp:53 > Uh-oh :) What is that? (finding it and killing it) REPOSITORY R241 KIO BRANCH arcpatch-D11993 REVISION DETAIL https://phabricator.kde.org/D11993 To: sharvey, ngraham, dfaure, #frameworks, broulik Cc: #dolphin, cfeck, fabiank, broulik, michaelh, ngraham, bruns