X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=LayoutTests%2Fplatform%2Fefl%2Ftables%2Fmozilla%2Fmarvin%2Fx_col_span-expected.txt;h=726c4fcf3439e891b6142bd15290b11c52ebdcb8;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=11350dbe071de43c888a51c5c7f4c5e6e7da54b5;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_span-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_span-expected.txt
index 11350db..726c4fc 100755
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_span-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_col_span-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x40
   RenderBlock {html} at (0,0) size 800x40
     RenderBody {body} at (8,8) size 784x24
@@ -14,3 +15,21 @@ layer at (0,0) size 800x40
             RenderTableCell {td} at (204,2) size 200x18 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 167x14
                 text run at (2,2) width 167: "This column should be 200px wide"
+=======
+layer at (0,0) size 800x64
+  RenderBlock {html} at (0,0) size 800x64
+    RenderBody {body} at (8,8) size 784x48
+      RenderTable {table} at (0,0) size 408x48 [border: (1px outset #808080)]
+        RenderTableCol {colgroup} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+        RenderTableSection (anonymous) at (1,1) size 406x46
+          RenderTableRow {tr} at (0,2) size 406x42
+            RenderTableCell {td} at (2,2) size 200x42 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 188x38
+                text run at (2,2) width 188: "This column should be 200px"
+                text run at (2,21) width 31: "wide"
+            RenderTableCell {td} at (204,2) size 200x42 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 188x38
+                text run at (2,2) width 188: "This column should be 200px"
+                text run at (2,21) width 31: "wide"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d