tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt
index 15e71fb..d0d3d15 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x76
   RenderBlock {HTML} at (0,0) size 800x76
     RenderBody {BODY} at (8,12) size 784x56
@@ -7,6 +8,15 @@ layer at (0,0) size 800x76
         RenderText {#text} at (0,0) size 316x14
           text run at (0,0) width 316: "Test passes if the orange and blue boxes below are the same width."
       RenderBlock {DIV} at (0,26) size 100x30 [bgcolor=#FFA500]
+=======
+layer at (0,0) size 800x89
+  RenderBlock {HTML} at (0,0) size 800x89
+    RenderBody {BODY} at (8,16) size 784x65
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 422x19
+          text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width."
+      RenderBlock {DIV} at (0,35) size 100x30 [bgcolor=#FFA500]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {DIV} at (10,0) size 140x30 [border: (10px solid #FFA500) none (10px solid #FFA500)]
 layer at (8,82) size 150x30
   RenderBlock (positioned) {DIV} at (8,82) size 150x30 [bgcolor=#0000FF]