[webkit-reviews] review granted: [Bug 48429] [Gtk] Populate DumpRenderTreeSupportGtk : [Attachment 76076] patch 4 - v2

[bugzilla-daemon at webkit.org]

Martin Robinson <mrobinson at webkit.org> has granted Antonio Gomes
<tonikitoo at webkit.org>'s request for review:
Bug 48429: [Gtk] Populate DumpRenderTreeSupportGtk
https://bugs.webkit.org/show_bug.cgi?id=48429

Attachment 76076: patch 4 - v2
https://bugs.webkit.org/attachment.cgi?id=76076&action=review

------- Additional Comments from Martin Robinson <mrobinson at webkit.org>
View in context: https://bugs.webkit.org/attachment.cgi?id=76076&action=review

Yay!

> WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:7
> +<<<<<<< HEAD
>   *  Copyright (C) 2010 Joone Hur <joone at kldp.org>
> +=======
> + *  Copyright (C) 2009 Google Inc. All rights reserved.
> +>>>>>>> 2010-12-09  Antonio Gomes  <agomes at rim.com>

Please resolve these changes before landing.