tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/table/016-expected.txt b/LayoutTests/platform/efl/fast/table/016-expected.txt
index 297783c..6c56f20 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/016-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/016-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 784x84 [bgcolor=#808000]
         RenderTableSection {TBODY} at (0,0) size 784x84
           RenderTableRow {TR} at (0,0) size 784x84
@@ -17,3 +18,19 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (54,0) size 730x14 [bgcolor=#008000] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 147x14
                 text run at (0,0) width 147: "Animal Friends Rescue Project"
+=======
+      RenderTable {TABLE} at (0,0) size 784x114 [bgcolor=#808000]
+        RenderTableSection {TBODY} at (0,0) size 784x114
+          RenderTableRow {TR} at (0,0) size 784x114
+            RenderTableCell {TD} at (0,0) size 72x114 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 72x114
+                text run at (0,0) width 53: "Dorothy"
+                text run at (0,19) width 72: "Rothschild:"
+                text run at (0,38) width 37: "Love,"
+                text run at (0,57) width 58: "curiosity,"
+                text run at (0,76) width 49: "freckles"
+                text run at (0,95) width 23: "and"
+            RenderTableCell {TD} at (72,0) size 712x19 [bgcolor=#008000] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 196x19
+                text run at (0,0) width 196: "Animal Friends Rescue Project"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d