tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / bugs / bug57378-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug57378-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug57378-expected.txt
index 6498e6f..b29e450 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug57378-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug57378-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 72x46 [border: (1px outset #808080)]
         RenderTableSection {THEAD} at (1,1) size 70x22
           RenderTableRow {TR} at (0,2) size 70x18
@@ -14,3 +15,16 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (2,2) size 66x18 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 58x14
                 text run at (2,2) width 58: "inside tbody"
+=======
+      RenderTable {TABLE} at (0,0) size 91x56 [border: (1px outset #808080)]
+        RenderTableSection {THEAD} at (1,1) size 89x27
+          RenderTableRow {TR} at (0,2) size 89x23
+            RenderTableCell {TH} at (2,2) size 85x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 81x19
+                text run at (2,2) width 81: "inside thead"
+        RenderTableSection {TBODY} at (1,28) size 89x27
+          RenderTableRow {TR} at (0,2) size 89x23
+            RenderTableCell {TD} at (2,2) size 85x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 77x19
+                text run at (2,2) width 77: "inside tbody"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d