tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / images / imagemap-focus-ring-outline-color-expected.txt

diff --git a/LayoutTests/platform/efl/fast/images/imagemap-focus-ring-outline-color-expected.txt b/LayoutTests/platform/efl/fast/images/imagemap-focus-ring-outline-color-expected.txt
index 802518a..df19c45 100755 (executable)
--- a/LayoutTests/platform/efl/fast/images/imagemap-focus-ring-outline-color-expected.txt
+++ b/LayoutTests/platform/efl/fast/images/imagemap-focus-ring-outline-color-expected.txt
@@ -3,11 +3,19 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x28
         RenderText {#text} at (0,0) size 764x28
           text run at (0,0) width 764: "Assuming the port-specific theme draws focus rings, this test can be used to ensure that a focus ring is drawn for an <area>. This test PASSED if a green-colored"
           text run at (0,14) width 304: "focus ring is drawn around the <area> in the imagemap (below)."
       RenderBlock (anonymous) at (0,40) size 784x128
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 776x38
+          text run at (0,0) width 776: "Assuming the port-specific theme draws focus rings, this test can be used to ensure that a focus ring is drawn for an <area>."
+          text run at (0,19) width 642: "This test PASSED if a green-colored focus ring is drawn around the <area> in the imagemap (below)."
+      RenderBlock (anonymous) at (0,54) size 784x128
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {MAP} at (0,0) size 0x0
           RenderText {#text} at (0,0) size 0x0
           RenderText {#text} at (0,0) size 0x0