tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/invalid/020-expected.txt b/LayoutTests/platform/efl/fast/invalid/020-expected.txt
index 5e48423..e99f8cf 100755 (executable)
--- a/LayoutTests/platform/efl/fast/invalid/020-expected.txt
+++ b/LayoutTests/platform/efl/fast/invalid/020-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x30
   RenderBlock {html} at (0,0) size 800x30
     RenderBody {body} at (8,8) size 784x14
@@ -8,4 +9,14 @@ layer at (0,0) size 800x30
           text run at (0,0) width 21: "Text"
       RenderTable {table} at (0,14) size 4x0
       RenderTable at (0,14) size 0x0
+=======
+layer at (0,0) size 800x35
+  RenderBlock {html} at (0,0) size 800x35
+    RenderBody {body} at (8,8) size 784x19
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 29x19
+          text run at (0,0) width 29: "Text"
+      RenderTable {table} at (0,19) size 2x0
+      RenderTable at (0,19) size 0x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableCol {colgroup} at (0,0) size 0x0