tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt
index 3ae5376..8549cbb 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x150
   RenderBlock {HTML} at (0,0) size 800x150
     RenderBody {BODY} at (8,12) size 784x126
@@ -7,5 +8,14 @@ layer at (0,0) size 800x150
         RenderText {#text} at (0,0) size 144x14
           text run at (0,0) width 144: "There should be no red below."
       RenderBlock {DIV} at (0,26) size 784x100 [bgcolor=#FF0000]
+=======
+layer at (0,0) size 800x167
+  RenderBlock {HTML} at (0,0) size 800x167
+    RenderBody {BODY} at (8,16) size 784x135
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 193x19
+          text run at (0,0) width 193: "There should be no red below."
+      RenderBlock {DIV} at (0,35) size 784x100 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {P} at (0,0) size 784x100
           RenderImage {IMG} at (0,0) size 784x100