tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / table-row-before-child-in-block-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/table-row-before-child-in-block-expected.txt b/LayoutTests/platform/efl/fast/table/table-row-before-child-in-block-expected.txt
index 67e7044..629b59d 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/table-row-before-child-in-block-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/table-row-before-child-in-block-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
       RenderBlock {DIV} at (0,0) size 784x58 [color=#FF0000] [border: (3px solid #008000)]
         RenderTable at (15,15) size 46x14 [color=#000000]
           RenderTableSection (anonymous) at (0,0) size 46x14
@@ -13,3 +14,15 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (15,29) size 754x14
           RenderText {#text} at (0,0) size 56x14
             text run at (0,0) width 56: "CONTENT"
+=======
+      RenderBlock {DIV} at (0,0) size 784x76 [color=#FF0000] [border: (3px solid #008000)]
+        RenderTable at (19,19) size 63x19
+          RenderTableSection (anonymous) at (0,0) size 63x19
+            RenderTableRow (anonymous) at (0,0) size 63x19 [border: (3px solid #0000FF)]
+              RenderTableCell (anonymous) at (0,0) size 63x19 [r=0 c=0 rs=1 cs=1]
+                RenderText at (0,0) size 63x19
+                  text run at (0,0) width 63: "BEFORE"
+        RenderBlock {DIV} at (19,38) size 746x19
+          RenderText {#text} at (0,0) size 77x19
+            text run at (0,0) width 77: "CONTENT"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d