tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / 20110323 / absolute-non-replaced-width-010-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt
index 48ce534..e0c5926 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x244
   RenderBlock {HTML} at (0,0) size 800x244
     RenderBody {BODY} at (8,12) size 784x224
@@ -11,4 +12,17 @@ layer at (8,38) size 198x198
 layer at (11,41) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x96
+=======
+layer at (0,0) size 800x257
+  RenderBlock {HTML} at (0,0) size 800x257
+    RenderBody {BODY} at (8,16) size 784x233
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 680x19
+          text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page."
+layer at (8,51) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
+layer at (11,54) size 96x96
+  RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
+    RenderText {#text} at (0,0) size 96x97
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       text run at (0,0) width 96: "X"