tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / fixed-nested-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/fixed-nested-expected.txt b/LayoutTests/platform/efl/fast/table/fixed-nested-expected.txt
index ff2c8bb..fadb30c 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/fixed-nested-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/fixed-nested-expected.txt
@@ -3,6 +3,7 @@ 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
       RenderTable {TABLE} at (0,0) size 740x24 [bgcolor=#008000]
         RenderTableSection {TBODY} at (0,0) size 740x24
           RenderTableRow {TR} at (0,2) size 740x20
@@ -14,3 +15,16 @@ layer at (0,0) size 800x600
                     RenderTableCell {TD} at (2,2) size 582x16 [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (1,1) size 79x14
                         text run at (1,1) width 79: "here is some text"
+=======
+      RenderTable {TABLE} at (0,0) size 740x29 [bgcolor=#008000]
+        RenderTableSection {TBODY} at (0,0) size 740x29
+          RenderTableRow {TR} at (0,2) size 740x25
+            RenderTableCell {TD} at (2,14) size 1x0 [bgcolor=#FFFF00] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (5,2) size 733x25 [r=0 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (0,0) size 586x25
+                RenderTableSection {TBODY} at (0,0) size 586x25
+                  RenderTableRow {TR} at (0,2) size 586x21
+                    RenderTableCell {TD} at (2,2) size 582x21 [r=0 c=0 rs=1 cs=1]
+                      RenderText {#text} at (1,1) size 105x19
+                        text run at (1,1) width 105: "here is some text"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d