ngraham added inline comments.

INLINE COMMENTS

> kdiroperatordetailview.cpp:53
>  
> +<<<<<<< HEAD
>  void KDirOperatorDetailView::setModel(QAbstractItemModel *model)

Uh-oh :)

> kdiroperatordetailview.cpp:71
> +=======
> +>>>>>>> Remove unneeded resize code; ensure other columns fill to contents
>  bool KDirOperatorDetailView::setViewMode(KFile::FileView viewMode)

Uh-oh part II :)

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

Reply via email to