tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / float / 030-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/float/030-expected.txt b/LayoutTests/platform/efl/fast/block/float/030-expected.txt
index 627eba0..e5d0670 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/float/030-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/float/030-expected.txt
@@ -2,12 +2,21 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 562x14
           text run at (0,0) width 346: "You should see a 500x300 rectangle with orange, yellow and olive rects. "
           text run at (346,0) width 216: "No red should be visible or the test has failed."
       RenderBlock (floating) {DIV} at (0,26) size 500x300 [bgcolor=#FF0000]
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 750x19
+          text run at (0,0) width 463: "You should see a 500x300 rectangle with orange, yellow and olive rects. "
+          text run at (463,0) width 287: "No red should be visible or the test has failed."
+      RenderBlock (floating) {DIV} at (0,35) size 500x300 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock (floating) {DIV} at (0,0) size 250x300 [bgcolor=#FFA500]
         RenderBlock (floating) {DIV} at (250,0) size 250x300
           RenderBlock (floating) {DIV} at (0,0) size 250x40 [bgcolor=#FFFF00]