[webkit-reviews] review canceled: [Bug 31065] Web Inspector: Timeline should show resources loading. : [Attachment 42485] Updates and resolves the conflicts.

[bugzilla-daemon at webkit.org]

WebKit Commit Bot <eseidel at chromium.org> has canceled  review:
Bug 31065: Web Inspector: Timeline should show resources loading.
https://bugs.webkit.org/show_bug.cgi?id=31065

Attachment 42485: Updates and resolves the conflicts.
https://bugs.webkit.org/attachment.cgi?id=42485&action=review