tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_colspan-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_colspan-expected.txt
index 6a4f7fa..292fa92 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_colspan-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_colspan-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x60
   RenderBlock {html} at (0,0) size 800x60
     RenderBody {body} at (8,8) size 784x44
@@ -16,3 +17,21 @@ layer at (0,0) size 800x60
             RenderTableCell {th} at (76,22) size 73x18 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (17,2) size 39x14
                 text run at (17,2) width 39: "xxx xxx"
+=======
+layer at (0,0) size 800x70
+  RenderBlock {html} at (0,0) size 800x70
+    RenderBody {body} at (8,8) size 784x54
+      RenderTable {table} at (0,0) size 197x54 [border: (1px outset #808080)]
+        RenderTableSection (anonymous) at (1,1) size 195x52
+          RenderTableRow {tr} at (0,2) size 195x23
+            RenderTableCell {th} at (2,2) size 191x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+              RenderText {#text} at (2,2) size 187x19
+                text run at (2,2) width 187: "This cell spans two columns"
+          RenderTableRow {tr} at (0,27) size 195x23
+            RenderTableCell {th} at (2,27) size 94x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (21,2) size 52x19
+                text run at (21,2) width 52: "xxx xxx"
+            RenderTableCell {th} at (98,27) size 95x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (21,2) size 53x19
+                text run at (21,2) width 53: "xxx xxx"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d