tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_th_colspan-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_th_colspan-expected.txt
index ec7a920..61afbf6 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_th_colspan-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_th_colspan-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 (anonymous) at (0,0) size 784x28
         RenderText {#text} at (0,0) size 447x14
           text run at (0,0) width 447: "This table uses a COLSPAN attribute in the TH tag. The COLSPAN attribute has a value of 6."
@@ -33,3 +34,35 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (237,22) size 28x18 [border: (1px inset #808080)] [r=1 c=5 rs=1 cs=1]
               RenderText {#text} at (2,2) size 24x14
                 text run at (2,2) width 24: "Unix"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 600x19
+          text run at (0,0) width 600: "This table uses a COLSPAN attribute in the TH tag. The COLSPAN attribute has a value of 6."
+        RenderBR {BR} at (600,15) size 0x0
+        RenderBR {BR} at (0,19) size 0x19
+      RenderTable {TABLE} at (0,38) size 346x54 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 344x52
+          RenderTableRow {TR} at (0,2) size 344x23
+            RenderTableCell {TH} at (2,2) size 340x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=6]
+              RenderText {#text} at (33,2) size 274x19
+                text run at (33,2) width 274: "Netscape Communicator 4.0.6 Platforms"
+          RenderTableRow {TR} at (0,27) size 344x23
+            RenderTableCell {TD} at (2,27) size 60x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 56x19
+                text run at (2,2) width 56: "Mac 68k"
+            RenderTableCell {TD} at (64,27) size 77x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 73x19
+                text run at (2,2) width 73: "Power Mac"
+            RenderTableCell {TD} at (143,27) size 55x23 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 51x19
+                text run at (2,2) width 51: "Win 3.1"
+            RenderTableCell {TD} at (200,27) size 51x23 [border: (1px inset #808080)] [r=1 c=3 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 47x19
+                text run at (2,2) width 47: "Win 95"
+            RenderTableCell {TD} at (253,27) size 51x23 [border: (1px inset #808080)] [r=1 c=4 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 47x19
+                text run at (2,2) width 47: "Win 98"
+            RenderTableCell {TD} at (306,27) size 36x23 [border: (1px inset #808080)] [r=1 c=5 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "Unix"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d