tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / invalid / 017-expected.txt

diff --git a/LayoutTests/platform/efl/fast/invalid/017-expected.txt b/LayoutTests/platform/efl/fast/invalid/017-expected.txt
index 2f47325..e943809 100755 (executable)
--- a/LayoutTests/platform/efl/fast/invalid/017-expected.txt
+++ b/LayoutTests/platform/efl/fast/invalid/017-expected.txt
@@ -5,6 +5,7 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {P} at (0,0) size 784x0
         RenderInline {A} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderInline {A} at (0,0) size 117x14
           RenderText {#text} at (0,0) size 117x14
@@ -12,3 +13,12 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,26) size 4x4
         RenderTableSection {TBODY} at (0,0) size 4x4
           RenderTableRow {TR} at (0,2) size 4x0
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderInline {A} at (0,0) size 155x19
+          RenderText {#text} at (0,0) size 155x19
+            text run at (0,0) width 155: "You should see this text."
+      RenderTable {TABLE} at (0,35) size 2x4
+        RenderTableSection {TBODY} at (0,0) size 2x4
+          RenderTableRow {TR} at (0,2) size 2x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d