tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug10565-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug10565-expected.txt
index b31c5f8..74ac4ce 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug10565-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug10565-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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 367x14
           text run at (0,0) width 367: "Using a 10px wide transparent gif with td width=\"10\" in the middle column..."
@@ -11,9 +12,23 @@ layer at (0,0) size 800x600
           RenderTableRow {TR} at (0,0) size 674x222
             RenderTableCell {TD} at (0,0) size 331x222 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderInline {A} at (0,0) size 329x14 [color=#0000EE]
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 490x19
+          text run at (0,0) width 490: "Using a 10px wide transparent gif with td width=\"10\" in the middle column..."
+      RenderTable {TABLE} at (0,35) size 676x224 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 674x222
+          RenderTableRow {TR} at (0,0) size 674x222
+            RenderTableCell {TD} at (0,0) size 331x222 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderInline {A} at (0,0) size 329x19 [color=#0000EE]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
                 RenderImage {IMG} at (1,1) size 329x220
             RenderTableCell {TD} at (331,109) size 12x3 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 10x1
             RenderTableCell {TD} at (343,0) size 331x222 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+<<<<<<< HEAD
               RenderInline {A} at (0,0) size 329x14 [color=#0000EE]
+=======
+              RenderInline {A} at (0,0) size 329x19 [color=#0000EE]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
                 RenderImage {IMG} at (1,1) size 329x220