tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug53690-2-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug53690-2-expected.txt
index c821a62..761eb62 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug53690-2-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug53690-2-expected.txt
@@ -5,6 +5,7 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {FORM} at (0,0) size 784x0
       RenderBlock {FORM} at (0,0) size 784x0
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,0) size 25x24 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 23x22
           RenderTableRow {TR} at (0,2) size 23x18
@@ -13,3 +14,13 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (8,2) size 13x18 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 9x14
                 text run at (2,2) width 9: "X"
+=======
+      RenderTable {TABLE} at (0,0) size 28x29 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 26x27
+          RenderTableRow {TR} at (0,2) size 26x23
+            RenderTableCell {TD} at (2,3) size 4x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {FORM} at (2,2) size 0x0
+            RenderTableCell {TD} at (8,2) size 16x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 12x19
+                text run at (2,2) width 12: "X"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d