X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ftables%2Fmozilla%2Fbugs%2Fbug2962-expected.txt;h=57721ff4e63197720c5750bf1c4002c1b04ed924;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=f263cee201737bbae7cace5df95dd94cec597cbb;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug2962-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug2962-expected.txt
index f263cee..57721ff 100755
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug2962-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug2962-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
       RenderTable {TABLE} at (0,0) size 300x38 [border: (2px outset #808080)]
         RenderTableSection {TBODY} at (2,2) size 296x34
           RenderTableRow {TR} at (0,0) size 296x34
@@ -20,3 +21,22 @@ layer at (0,0) size 800x600
                     RenderText {#text} at (81,14) size 128x14
                       text run at (81,14) width 31: "It's all "
                       text run at (112,14) width 97: "yours at ACMEcity!"
+=======
+      RenderTable {TABLE} at (0,0) size 300x48 [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 296x44
+          RenderTableRow {TR} at (0,0) size 296x44
+            RenderTableCell {TD} at (0,0) size 296x44 [bgcolor=#FFFF00] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {CENTER} at (3,3) size 290x38
+                RenderInline {A} at (0,0) size 0x0 [color=#0000EE]
+                  RenderImage {IMG} at (0,0) size 4x4
+                RenderText {#text} at (0,0) size 0x0
+                RenderInline {A} at (0,0) size 185x38 [color=#0000EE]
+                  RenderInline {FONT} at (0,0) size 185x38 [color=#000000]
+                    RenderText {#text} at (56,0) size 185x19
+                      text run at (56,0) width 111: "Free Homepage! "
+                      text run at (166,0) width 75: "Free Email!"
+                    RenderBR {BR} at (240,15) size 1x0
+                    RenderText {#text} at (60,19) size 170x19
+                      text run at (60,19) width 41: "It's all "
+                      text run at (101,19) width 129: "yours at ACMEcity!"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d