tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / float / float-not-removed-from-next-sibling3-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/float/float-not-removed-from-next-sibling3-expected.txt b/LayoutTests/platform/efl/fast/block/float/float-not-removed-from-next-sibling3-expected.txt
index 18a8616..f5ea9d3 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/float/float-not-removed-from-next-sibling3-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/float/float-not-removed-from-next-sibling3-expected.txt
@@ -18,6 +18,7 @@ layer at (8,8) size 15x200
 layer at (8,8) size 15x200
   RenderBlock {DIV} at (0,0) size 15x200
     RenderImage {IMG} at (0,0) size 15x200 [bgcolor=#C0C0C0]
+<<<<<<< HEAD
 layer at (8,208) size 15x72
   RenderBlock (positioned) {DIV} at (0,200) size 15x72
     RenderBlock (anonymous) at (0,0) size 15x0
@@ -30,4 +31,18 @@ layer at (8,208) size 15x72
           text run at (0,24) width 12: "C"
           text run at (0,36) width 12: "D"
     RenderBlock (anonymous) at (0,72) size 15x0
+=======
+layer at (8,208) size 16x100
+  RenderBlock (positioned) {DIV} at (0,200) size 16x100
+    RenderBlock (anonymous) at (0,0) size 16x0
+      RenderInline {A} at (0,0) size 0x0
+    RenderBlock (anonymous) at (0,16) size 16x68
+      RenderBlock {P} at (0,0) size 16x68
+        RenderText {#text} at (0,0) size 16x68
+          text run at (0,0) width 16: "A"
+          text run at (0,17) width 16: "B"
+          text run at (0,34) width 16: "C"
+          text run at (0,51) width 16: "D"
+    RenderBlock (anonymous) at (0,100) size 16x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderInline {A} at (0,0) size 0x0