tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / 20110323 / absolute-replaced-height-025-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt
index a4c2f96..a63f4c3 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {HTML} at (0,0) size 800x38
     RenderBody {BODY} at (8,12) size 784x14
@@ -7,11 +8,24 @@ layer at (0,0) size 800x38
         RenderText {#text} at (0,0) size 228x14
           text run at (0,0) width 228: "Test passes if there is no red visible on the page."
 layer at (8,134) size 306x156
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 303x19
+          text run at (0,0) width 303: "Test passes if there is no red visible on the page."
+layer at (8,147) size 306x156
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x150
       RenderView at (0,0) size 300x150
     layer at (0,0) size 300x150
       RenderBlock {HTML} at (0,0) size 300x150
         RenderBody {BODY} at (8,8) size 284x134
+<<<<<<< HEAD
 layer at (8,134) size 306x156
+=======
+layer at (8,147) size 306x156
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)]