tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla_expected_failures / bugs / bug3166-16-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug3166-16-expected.txt b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug3166-16-expected.txt
index dcaba38..67e761f 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug3166-16-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug3166-16-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 (365,0) size 53x46 [border: (3px solid #008000)]
         RenderBlock {CAPTION} at (16,0) size 15x20 [border: (3px solid #FFA500)]
           RenderText {#text} at (3,3) size 16x14
@@ -12,3 +13,14 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (2,2) size 43x16 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 41x14
                 text run at (1,1) width 41: "table cell"
+=======
+      RenderTable {TABLE} at (358,0) size 68x56 [border: (3px solid #008000)]
+        RenderBlock {CAPTION} at (22,0) size 18x25 [border: (3px solid #FFA500)]
+          RenderText {#text} at (3,3) size 22x19
+            text run at (3,3) width 22: "cap"
+        RenderTableSection {TBODY} at (3,28) size 62x25
+          RenderTableRow {TR} at (0,2) size 62x21
+            RenderTableCell {TD} at (2,2) size 58x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 56x19
+                text run at (1,1) width 56: "table cell"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d