tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt
index f1e54ae..2542f96 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-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
@@ -9,4 +10,15 @@ layer at (0,0) size 800x38
 layer at (8,62) size 192x96
   RenderBlock (positioned) {DIV} at (0,24) size 192x96 [color=#FFA500] [bgcolor=#0000FF]
     RenderText {#text} at (0,0) size 96x96
+=======
+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 425x19
+          text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height."
+layer at (8,75) size 192x96
+  RenderBlock (positioned) {DIV} at (0,24) size 192x96 [color=#FFA500] [bgcolor=#0000FF]
+    RenderText {#text} at (0,0) size 96x97
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       text run at (0,0) width 96: "X"