tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / dom / deleteColGroup1-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/dom/deleteColGroup1-expected.txt b/LayoutTests/platform/efl/tables/mozilla/dom/deleteColGroup1-expected.txt
index f5519c1..fb7fb31 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/dom/deleteColGroup1-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/dom/deleteColGroup1-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 784x14
         RenderText {#text} at (0,0) size 160x14
           text run at (0,0) width 160: "The 2 tables should look the same"
@@ -42,3 +43,44 @@ layer at (0,0) size 800x600
                 text run at (2,2) width 20: "auto"
       RenderBlock (anonymous) at (0,76) size 784x14
         RenderBR {BR} at (0,0) size 0x14
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 214x19
+          text run at (0,0) width 214: "The 2 tables should look the same"
+      RenderTable {TABLE} at (0,19) size 474x29 [bgcolor=#FFA500] [border: (1px outset #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (1,1) size 472x27
+          RenderTableRow {TR} at (0,2) size 472x23
+            RenderTableCell {TD} at (2,2) size 200x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 24x19
+                text run at (2,2) width 24: "200"
+            RenderTableCell {TD} at (204,2) size 200x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 24x19
+                text run at (2,2) width 24: "200"
+            RenderTableCell {TD} at (406,2) size 31x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 27x19
+                text run at (2,2) width 27: "auto"
+            RenderTableCell {TD} at (439,2) size 31x23 [border: (1px inset #808080)] [r=0 c=3 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 27x19
+                text run at (2,2) width 27: "auto"
+      RenderBlock (anonymous) at (0,48) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderTable {TABLE} at (0,67) size 474x29 [bgcolor=#FFA500] [border: (1px outset #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (1,1) size 472x27
+          RenderTableRow {TR} at (0,2) size 472x23
+            RenderTableCell {TD} at (2,2) size 200x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 24x19
+                text run at (2,2) width 24: "200"
+            RenderTableCell {TD} at (204,2) size 200x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 24x19
+                text run at (2,2) width 24: "200"
+            RenderTableCell {TD} at (406,2) size 31x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 27x19
+                text run at (2,2) width 27: "auto"
+            RenderTableCell {TD} at (439,2) size 31x23 [border: (1px inset #808080)] [r=0 c=3 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 27x19
+                text run at (2,2) width 27: "auto"
+      RenderBlock (anonymous) at (0,96) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d