tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / table / 026-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/026-expected.txt b/LayoutTests/platform/efl/fast/table/026-expected.txt
index 22eddbc..b7b7e90 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/026-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/026-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 (728,0) size 56x26
         RenderTableSection {TBODY} at (0,0) size 56x26
           RenderTableRow {TR} at (0,2) size 56x22
@@ -20,3 +21,22 @@ layer at (0,0) size 800x600
                       RenderTableCell {TD} at (41,2) size 7x16 [r=0 c=2 rs=1 cs=1]
                         RenderText {#text} at (1,1) size 5x14
                           text run at (1,1) width 5: "c"
+=======
+      RenderTable {TABLE} at (715,0) size 69x31
+        RenderTableSection {TBODY} at (0,0) size 69x31
+          RenderTableRow {TR} at (0,2) size 69x27
+            RenderTableCell {TD} at (2,2) size 65x27 [r=0 c=0 rs=1 cs=1]
+              RenderBlock (floating) {DIV} at (1,1) size 63x25
+                RenderTable {TABLE} at (0,0) size 63x25
+                  RenderTableSection {TBODY} at (0,0) size 63x25
+                    RenderTableRow {TR} at (0,2) size 63x21
+                      RenderTableCell {TD} at (2,2) size 9x21 [r=0 c=0 rs=1 cs=1]
+                        RenderText {#text} at (1,1) size 7x19
+                          text run at (1,1) width 7: "a"
+                      RenderTableCell {TD} at (13,2) size 37x21 [r=0 c=1 rs=1 cs=1]
+                        RenderText {#text} at (1,1) size 35x19
+                          text run at (1,1) width 35: "Hello"
+                      RenderTableCell {TD} at (52,2) size 9x21 [r=0 c=2 rs=1 cs=1]
+                        RenderText {#text} at (1,1) size 7x19
+                          text run at (1,1) width 7: "c"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d