tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt
index fa072c7..bdfdf9a 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x340
   RenderBlock {HTML} at (0,0) size 800x340
     RenderBody {BODY} at (8,12) size 784x320
@@ -10,4 +11,17 @@ layer at (8,38) size 198x294
   RenderBlock (relative positioned) {DIV} at (0,26) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
 layer at (107,41) size 96x96
+=======
+layer at (0,0) size 800x372
+  RenderBlock {HTML} at (0,0) size 800x372
+    RenderBody {BODY} at (8,16) size 784x348
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 780x38
+          text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
+          text run at (0,19) width 28: "box."
+layer at (8,70) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+    RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
+layer at (107,73) size 96x96
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderImage {IMG} at (99,3) size 96x96