tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/th_valign_baseline-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/th_valign_baseline-expected.txt
index d86825d..6adde36 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/th_valign_baseline-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/th_valign_baseline-expected.txt
@@ -3,15 +3,23 @@ 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 131x14
           text run at (0,0) width 131: "TH VALIGN=BASELINE"
       RenderTable {TABLE} at (0,14) size 784x195 [border: (1px outset #808080)]
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 177x19
+          text run at (0,0) width 177: "TH VALIGN=BASELINE"
+      RenderTable {TABLE} at (0,19) size 784x195 [border: (1px outset #808080)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (1,1) size 782x193
           RenderTableRow {TR} at (0,2) size 782x189
             RenderTableCell {TH} at (2,2) size 304x189 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderImage {IMG} at (2,2) size 300x185
               RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
             RenderTableCell {TH} at (308,2) size 235x32 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (8,2) size 219x28
                 text run at (8,2) width 219: "This text should be vertically aligned to the"
@@ -20,3 +28,13 @@ layer at (0,0) size 800x600
               RenderText {#text} at (8,2) size 219x28
                 text run at (8,2) width 219: "This text should be vertically aligned to the"
                 text run at (97,16) width 41: "baseline"
+=======
+            RenderTableCell {TH} at (308,2) size 235x42 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (20,2) size 195x38
+                text run at (20,2) width 195: "This text should be vertically"
+                text run at (43,21) width 149: "aligned to the baseline"
+            RenderTableCell {TH} at (545,2) size 235x42 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (20,2) size 195x38
+                text run at (20,2) width 195: "This text should be vertically"
+                text run at (43,21) width 149: "aligned to the baseline"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d