<table><tr><td style="">ngraham added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D11993">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11993#inline-61259">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdiroperatordetailview.cpp:53</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #aa2211"><<<<<<<</span> <span class="n">HEAD</span>
</div><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #aa4000">void</span> <span class="n">KDirOperatorDetailView</span><span style="color: #aa2211">::</span><span class="n">setModel</span><span class="p">(</span><span class="n">QAbstractItemModel</span> <span style="color: #aa2211">*</span><span class="n">model</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Uh-oh :)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11993#inline-61260">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdiroperatordetailview.cpp:71</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #aa2211">=======</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #aa2211">>>>>>>></span> <span class="n">Remove</span> <span class="n">unneeded</span> <span class="n">resize</span> <span class="n">code</span><span class="p">;</span> <span class="n">ensure</span> <span class="n">other</span> <span class="n">columns</span> <span class="n">fill</span> <span class="n">to</span> <span class="n">contents</span>
</div><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #aa4000">bool</span> <span class="n">KDirOperatorDetailView</span><span style="color: #aa2211">::</span><span class="n">setViewMode</span><span class="p">(</span><span class="n">KFile</span><span style="color: #aa2211">::</span><span class="n">FileView</span> <span class="n">viewMode</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Uh-oh part II :)</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R241 KIO</div></div></div><br /><div><strong>BRANCH</strong><div><div>arcpatch-D11993</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D11993">https://phabricator.kde.org/D11993</a></div></div><br /><div><strong>To: </strong>sharvey, ngraham, dfaure, Frameworks, broulik<br /><strong>Cc: </strong>Dolphin, cfeck, fabiank, broulik, michaelh, ngraham, bruns<br /></div>