tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/table/table-cell-after-child-in-block-expected.txt b/LayoutTests/platform/efl/fast/table/table-cell-after-child-in-block-expected.txt
index 6fa74c6..6af69c5 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/table-cell-after-child-in-block-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/table-cell-after-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 784x88 [color=#FF0000] [border: (3px solid #008000)]
         RenderBlock {DIV} at (15,15) size 754x14
           RenderText {#text} at (0,0) size 56x14
@@ -13,3 +14,15 @@ layer at (0,0) size 800x600
               RenderTableCell (anonymous) at (0,0) size 68x44 [color=#FF0000] [border: (3px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
                 RenderText at (15,15) size 38x14
                   text run at (15,15) width 38: "AFTER"
+=======
+      RenderBlock {DIV} at (0,0) size 784x114 [color=#FF0000] [border: (3px solid #008000)]
+        RenderBlock {DIV} at (19,19) size 746x19
+          RenderText {#text} at (0,0) size 77x19
+            text run at (0,0) width 77: "CONTENT"
+        RenderTable at (19,38) size 90x57
+          RenderTableSection (anonymous) at (0,0) size 90x57
+            RenderTableRow (anonymous) at (0,0) size 90x57
+              RenderTableCell (anonymous) at (0,0) size 90x57 [border: (3px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
+                RenderText at (19,19) size 52x19
+                  text run at (19,19) width 52: "AFTER"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d